Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WRR] Prefer application_utilization to cpu_utilization #33355

Merged
merged 4 commits into from
Jun 8, 2023
Merged

[WRR] Prefer application_utilization to cpu_utilization #33355

merged 4 commits into from
Jun 8, 2023

Conversation

yousukseung
Copy link
Contributor

No description provided.

@yousukseung yousukseung marked this pull request as draft June 6, 2023 10:01
@yousukseung
Copy link
Contributor Author

ORCA code is commented out yet.

@yousukseung yousukseung added the release notes: no Indicates if PR should not be in release notes label Jun 6, 2023
@yousukseung yousukseung marked this pull request as ready for review June 7, 2023 06:36
markdroth
markdroth approved these changes Jun 7, 2023
View reviewed changes
Copy link
Member

@markdroth markdroth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good, modulo a few minor test comments. Feel free to merge after addressing.

test/core/client_channel/lb_policy/weighted_round_robin_test.cc
/*qps=*/100.0, /*eps=*/0.0,
/*cpu_utilization=*/0.9)},
{kAddresses[1],
MakeBackendMetricData(/*app_utilization=*/0,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please change some of the data in this test to set both application_utilization and cpu_utilization, the latter using a bogus value, so that we are testing that we prefer application_utilization when both values are set.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a new test.

test/core/client_channel/lb_policy/weighted_round_robin_test.cc
{{kAddresses[0], MakeBackendMetricData(/*app_utilization=*/0,
/*qps=*/100.0, /*eps=*/0.0,
/*cpu_utilization=*/0.9)},
{kAddresses[1], MakeBackendMetricData(/*app_utilization=*/0,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment here as in the CpuUtilWhenNoAppUtil test above.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a new test.

test/cpp/end2end/xds/xds_wrr_end2end_test.cc Outdated
});
}

TEST_P(WrrTest, CpuUtilWithNoAppUtil) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we need to test this case again here. We're already covering this in the WRR unit test; all we're really checking here is the WRR config linkage via xDS, which does not affect the backend metric processing.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed.

@markdroth
Copy link
Member

Note that we can't merge this until the orca proto change has been imported.

@yousukseung yousukseung enabled auto-merge (squash) June 7, 2023 22:21
@yousukseung yousukseung disabled auto-merge June 7, 2023 22:39
@yousukseung
Copy link
Contributor Author

Orca proto change is imported cl/538546518, enabling auto-merge.

@yousukseung yousukseung enabled auto-merge (squash) June 7, 2023 22:40
@yousukseung yousukseung merged commit c03cd74 into grpc:master Jun 8, 2023
64 of 65 checks passed
@copybara-service copybara-service bot added the imported Specifies if the PR has been imported to the internal repository label Jun 8, 2023
veblush pushed a commit to veblush/grpc that referenced this pull request Jun 8, 2023
@yousukseung @veblush
[WRR] Prefer application_utilization to cpu_utilization (grpc#33355)
4033f3e 
<!--

If you know who should review your pull request, please assign it to
that
person, otherwise the pull request would get assigned randomly.

If your pull request is for a specific language, please add the
appropriate
lang label.

-->
@veblush veblush mentioned this pull request Jun 8, 2023
Merged
veblush added a commit that referenced this pull request Jun 9, 2023
@veblush @yousukseung
[WRR] Backport 1.56: Prefer application_utilization to cpu_utilization (
d9d47b5 
#33378)

Backport of #33355

Co-authored-by: Yousuk Seung <ysseung@google.com>
mario-vimal pushed a commit to mario-vimal/grpc that referenced this pull request Jun 15, 2023
@yousukseung @mario-vimal
[WRR] Prefer application_utilization to cpu_utilization (grpc#33355)
607dc4a 
<!--

If you know who should review your pull request, please assign it to
that
person, otherwise the pull request would get assigned randomly.

If your pull request is for a specific language, please add the
appropriate
lang label.

-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@markdroth markdroth markdroth approved these changes

Assignees
No one assigned
Labels
bloat/none imported Specifies if the PR has been imported to the internal repository lang/c++ lang/core per-call-memory/neutral per-channel-memory/neutral release notes: no Indicates if PR should not be in release notes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@yousukseung @markdroth