grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
yifeizhuang 2023-04-11 15:18:41 -07:00 committed by GitHub
parent 5082b4c02a
commit e12baed5a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
services/src/main/java/io/grpc/services/MetricRecorder.java
View File

@ -102,7 +102,7 @@ public final class MetricRecorder {
/** /**
* Update the QPS metrics data in the range [0, inf). Values outside the valid range are ignored. * 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)) { if (!MetricRecorderHelper.isQpsValid(value)) {
return; return;
} }
@ -112,7 +112,7 @@ public final class MetricRecorder {
/** /**
* Clear the QPS metrics data. * Clear the QPS metrics data.
*/ */
public void clearQps() { public void clearQpsMetric() {
qps = 0; qps = 0;
} }

4
xds/src/test/java/io/grpc/xds/orca/OrcaMetricReportingServerInterceptorTest.java
View File

@ -215,7 +215,7 @@ public class OrcaMetricReportingServerInterceptorTest {
cpuUtilizationMetrics = 0.3465; cpuUtilizationMetrics = 0.3465;
memoryUtilizationMetrics = 0.967; memoryUtilizationMetrics = 0.967;
metricRecorder.setMemoryUtilizationMetric(0.764); metricRecorder.setMemoryUtilizationMetric(0.764);
metricRecorder.setQps(1.618); metricRecorder.setQpsMetric(1.618);
metricRecorder.putUtilizationMetric("serverUtil1", 0.7467); metricRecorder.putUtilizationMetric("serverUtil1", 0.7467);
metricRecorder.putUtilizationMetric("serverUtil2", 0.2233); metricRecorder.putUtilizationMetric("serverUtil2", 0.2233);
metricRecorder.putUtilizationMetric("util1", 0.01); metricRecorder.putUtilizationMetric("util1", 0.01);
@ -240,7 +240,7 @@ public class OrcaMetricReportingServerInterceptorTest {
qpsMetrics = 5142.77; qpsMetrics = 5142.77;
metricRecorder.setCpuUtilizationMetric(0.314159); metricRecorder.setCpuUtilizationMetric(0.314159);
metricRecorder.setMemoryUtilizationMetric(0.764); metricRecorder.setMemoryUtilizationMetric(0.764);
metricRecorder.setQps(1.618); metricRecorder.setQpsMetric(1.618);
ClientCalls.blockingUnaryCall(channelToUse, SIMPLE_METHOD, CallOptions.DEFAULT, REQUEST); ClientCalls.blockingUnaryCall(channelToUse, SIMPLE_METHOD, CallOptions.DEFAULT, REQUEST);
Metadata receivedTrailers = trailersCapture.get(); Metadata receivedTrailers = trailersCapture.get();

10
xds/src/test/java/io/grpc/xds/orca/OrcaServiceImplTest.java
View File

@ -143,7 +143,7 @@ public class OrcaServiceImplTest {
ClientCall<OrcaLoadReportRequest, OrcaLoadReport> call = channel.newCall( ClientCall<OrcaLoadReportRequest, OrcaLoadReport> call = channel.newCall(
OpenRcaServiceGrpc.getStreamCoreMetricsMethod(), CallOptions.DEFAULT); OpenRcaServiceGrpc.getStreamCoreMetricsMethod(), CallOptions.DEFAULT);
defaultTestService.putUtilizationMetric("buffer", 0.2); defaultTestService.putUtilizationMetric("buffer", 0.2);
defaultTestService.setQps(1.9); defaultTestService.setQpsMetric(1.9);
call.start(listener, new Metadata()); call.start(listener, new Metadata());
call.sendMessage(OrcaLoadReportRequest.newBuilder() call.sendMessage(OrcaLoadReportRequest.newBuilder()
.setReportInterval(Duration.newBuilder().setSeconds(0).setNanos(500).build()).build()); .setReportInterval(Duration.newBuilder().setSeconds(0).setNanos(500).build()).build());
@ -154,7 +154,7 @@ public class OrcaServiceImplTest {
verify(listener).onMessage(eq(expect)); verify(listener).onMessage(eq(expect));
reset(listener); reset(listener);
defaultTestService.removeUtilizationMetric("buffer0"); defaultTestService.removeUtilizationMetric("buffer0");
defaultTestService.clearQps(); defaultTestService.clearQpsMetric();
assertThat(fakeClock.forwardTime(500, TimeUnit.NANOSECONDS)).isEqualTo(0); assertThat(fakeClock.forwardTime(500, TimeUnit.NANOSECONDS)).isEqualTo(0);
verifyNoInteractions(listener); verifyNoInteractions(listener);
assertThat(fakeClock.forwardTime(1, TimeUnit.SECONDS)).isEqualTo(1); assertThat(fakeClock.forwardTime(1, TimeUnit.SECONDS)).isEqualTo(1);
@ -255,14 +255,14 @@ public class OrcaServiceImplTest {
defaultTestService.setMemoryUtilizationMetric(goldenReport.getMemUtilization()); defaultTestService.setMemoryUtilizationMetric(goldenReport.getMemUtilization());
defaultTestService.setAllUtilizationMetrics(firstUtilization); defaultTestService.setAllUtilizationMetrics(firstUtilization);
defaultTestService.putUtilizationMetric("queue", 1.0); defaultTestService.putUtilizationMetric("queue", 1.0);
defaultTestService.setQps(1239.01); defaultTestService.setQpsMetric(1239.01);
Iterator<OrcaLoadReport> reports = OpenRcaServiceGrpc.newBlockingStub(channel) Iterator<OrcaLoadReport> reports = OpenRcaServiceGrpc.newBlockingStub(channel)
.streamCoreMetrics(OrcaLoadReportRequest.newBuilder().build()); .streamCoreMetrics(OrcaLoadReportRequest.newBuilder().build());
assertThat(reports.next()).isEqualTo(goldenReport); assertThat(reports.next()).isEqualTo(goldenReport);
defaultTestService.clearCpuUtilizationMetric(); defaultTestService.clearCpuUtilizationMetric();
defaultTestService.clearMemoryUtilizationMetric(); defaultTestService.clearMemoryUtilizationMetric();
defaultTestService.clearQps(); defaultTestService.clearQpsMetric();
fakeClock.forwardTime(1, TimeUnit.SECONDS); fakeClock.forwardTime(1, TimeUnit.SECONDS);
goldenReport = OrcaLoadReport.newBuilder() goldenReport = OrcaLoadReport.newBuilder()
.putAllUtilization(firstUtilization) .putAllUtilization(firstUtilization)
@ -279,7 +279,7 @@ public class OrcaServiceImplTest {
defaultTestService.setCpuUtilizationMetric(1.001); defaultTestService.setCpuUtilizationMetric(1.001);
defaultTestService.setMemoryUtilizationMetric(-0.001); defaultTestService.setMemoryUtilizationMetric(-0.001);
defaultTestService.setMemoryUtilizationMetric(1.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", -0.001);
defaultTestService.putUtilizationMetric("util-out-of-range", 1.001); defaultTestService.putUtilizationMetric("util-out-of-range", 1.001);
fakeClock.forwardTime(1, TimeUnit.SECONDS); fakeClock.forwardTime(1, TimeUnit.SECONDS);