Skip to content

orca, services: rename to (clear)setQpsMetric #10031

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

Merged
merged 2 commits into from
Apr 11, 2023
Merged

orca, services: rename to (clear)setQpsMetric #10031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42f1fc2
rename to setQpsMetric
YifeiZhuang Apr 10, 2023
0895628
Merge branch 'master' of https://github.com/grpc/grpc-java into orca-qps
YifeiZhuang Apr 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions services/src/main/java/io/grpc/services/MetricRecorder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public void clearMemoryUtilizationMetric() {
/**
* Update the QPS metrics data in the range [0, inf). Values outside the valid range are ignored.
*/
public void setQps(double value) {
public void setQpsMetric(double value) {
if (!MetricRecorderHelper.isQpsValid(value)) {
return;
}
Expand All @@ -112,7 +112,7 @@ public void setQps(double value) {
/**
* Clear the QPS metrics data.
*/
public void clearQps() {
public void clearQpsMetric() {
qps = 0;
}

Expand Down
4 changes: 2 additions & 2 deletions xds/src/test/java/io/grpc/xds/orca/OrcaMetricReportingServerInterceptorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ public void responseTrailersContainMergedMetricsFromCallMetricRecorderAndMetricR
cpuUtilizationMetrics = 0.3465;
memoryUtilizationMetrics = 0.967;
metricRecorder.setMemoryUtilizationMetric(0.764);
metricRecorder.setQps(1.618);
metricRecorder.setQpsMetric(1.618);
metricRecorder.putUtilizationMetric("serverUtil1", 0.7467);
metricRecorder.putUtilizationMetric("serverUtil2", 0.2233);
metricRecorder.putUtilizationMetric("util1", 0.01);
Expand All @@ -240,7 +240,7 @@ public void responseTrailersContainMergedMetricsFromCallMetricRecorderAndMetricR
qpsMetrics = 5142.77;
metricRecorder.setCpuUtilizationMetric(0.314159);
metricRecorder.setMemoryUtilizationMetric(0.764);
metricRecorder.setQps(1.618);
metricRecorder.setQpsMetric(1.618);

ClientCalls.blockingUnaryCall(channelToUse, SIMPLE_METHOD, CallOptions.DEFAULT, REQUEST);
Metadata receivedTrailers = trailersCapture.get();
Expand Down
10 changes: 5 additions & 5 deletions xds/src/test/java/io/grpc/xds/orca/OrcaServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public void testRequestIntervalLess() {
ClientCall<OrcaLoadReportRequest, OrcaLoadReport> call = channel.newCall(
OpenRcaServiceGrpc.getStreamCoreMetricsMethod(), CallOptions.DEFAULT);
defaultTestService.putUtilizationMetric("buffer", 0.2);
defaultTestService.setQps(1.9);
defaultTestService.setQpsMetric(1.9);
call.start(listener, new Metadata());
call.sendMessage(OrcaLoadReportRequest.newBuilder()
.setReportInterval(Duration.newBuilder().setSeconds(0).setNanos(500).build()).build());
Expand All @@ -154,7 +154,7 @@ public void testRequestIntervalLess() {
verify(listener).onMessage(eq(expect));
reset(listener);
defaultTestService.removeUtilizationMetric("buffer0");
defaultTestService.clearQps();
defaultTestService.clearQpsMetric();
assertThat(fakeClock.forwardTime(500, TimeUnit.NANOSECONDS)).isEqualTo(0);
verifyNoInteractions(listener);
assertThat(fakeClock.forwardTime(1, TimeUnit.SECONDS)).isEqualTo(1);
Expand Down Expand Up @@ -255,14 +255,14 @@ public void testApis() throws Exception {
defaultTestService.setMemoryUtilizationMetric(goldenReport.getMemUtilization());
defaultTestService.setAllUtilizationMetrics(firstUtilization);
defaultTestService.putUtilizationMetric("queue", 1.0);
defaultTestService.setQps(1239.01);
defaultTestService.setQpsMetric(1239.01);
Iterator<OrcaLoadReport> reports = OpenRcaServiceGrpc.newBlockingStub(channel)
.streamCoreMetrics(OrcaLoadReportRequest.newBuilder().build());
assertThat(reports.next()).isEqualTo(goldenReport);

defaultTestService.clearCpuUtilizationMetric();
defaultTestService.clearMemoryUtilizationMetric();
defaultTestService.clearQps();
defaultTestService.clearQpsMetric();
fakeClock.forwardTime(1, TimeUnit.SECONDS);
goldenReport = OrcaLoadReport.newBuilder()
.putAllUtilization(firstUtilization)
Expand All @@ -279,7 +279,7 @@ public void testApis() throws Exception {
defaultTestService.setCpuUtilizationMetric(1.001);
defaultTestService.setMemoryUtilizationMetric(-0.001);
defaultTestService.setMemoryUtilizationMetric(1.001);
defaultTestService.setQps(-0.001);
defaultTestService.setQpsMetric(-0.001);
defaultTestService.putUtilizationMetric("util-out-of-range", -0.001);
defaultTestService.putUtilizationMetric("util-out-of-range", 1.001);
fakeClock.forwardTime(1, TimeUnit.SECONDS);
Expand Down