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

services: allow cpu utilization greater than 1 (#10107)

This commit is contained in:
yifeizhuang 2023-04-28 11:59:10 -07:00 committed by GitHub
parent fe53346697
commit b249a5340e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/src/main/java/io/grpc/services/CallMetricRecorder.java
View File

@ -135,7 +135,7 @@ public final class CallMetricRecorder {
* @since 1.47.0 * @since 1.47.0
*/ */
public CallMetricRecorder recordCpuUtilizationMetric(double value) { public CallMetricRecorder recordCpuUtilizationMetric(double value) {
if (disabled || !MetricRecorderHelper.isUtilizationValid(value)) { if (disabled || !MetricRecorderHelper.isCpuUtilizationValid(value)) {
return this; return this;
} }
cpuUtilizationMetric = value; cpuUtilizationMetric = value;

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

@ -64,11 +64,11 @@ public final class MetricRecorder {
} }
/** /**
* Update the CPU utilization metrics data in the range [0, 1]. Values outside the valid range are * Update the CPU utilization metrics data in the range [0, inf). Values outside the valid range
* ignored. * are ignored.
*/ */
public void setCpuUtilizationMetric(double value) { public void setCpuUtilizationMetric(double value) {
if (!MetricRecorderHelper.isUtilizationValid(value)) { if (!MetricRecorderHelper.isCpuUtilizationValid(value)) {
return; return;
} }
cpuUtilization = value; cpuUtilization = value;

9
services/src/main/java/io/grpc/services/MetricRecorderHelper.java
View File

@ -29,6 +29,15 @@ final class MetricRecorderHelper {
return utilization >= 0.0 && utilization <= 1.0; return utilization >= 0.0 && utilization <= 1.0;
} }
/**
* Return true if the cpu utilization value is in the range [0, inf) and false otherwise.
* Occasionally users have over 100% cpu utilization and get a runaway effect where the backend
* with highest qps gets more and more qps sent to it. So we allow cpu utilization > 1.0.
*/
static boolean isCpuUtilizationValid(double utilization) {
return utilization >= 0.0;
}
/** /**
* Return true if the qps value is in the range [0, inf) and false otherwise. * Return true if the qps value is in the range [0, inf) and false otherwise.
*/ */

2
services/src/test/java/io/grpc/services/CallMetricRecorderTest.java
View File

@ -72,7 +72,7 @@ public class CallMetricRecorderTest {
recorder.recordUtilizationMetric("util1", 1.001); recorder.recordUtilizationMetric("util1", 1.001);
MetricReport dump = recorder.finalizeAndDump2(); MetricReport dump = recorder.finalizeAndDump2();
Truth.assertThat(dump.getCpuUtilization()).isEqualTo(0); Truth.assertThat(dump.getCpuUtilization()).isEqualTo(1.001);
Truth.assertThat(dump.getMemoryUtilization()).isEqualTo(0); Truth.assertThat(dump.getMemoryUtilization()).isEqualTo(0);
Truth.assertThat(dump.getQps()).isEqualTo(0); Truth.assertThat(dump.getQps()).isEqualTo(0);
Truth.assertThat(dump.getUtilizationMetrics()).isEmpty(); Truth.assertThat(dump.getUtilizationMetrics()).isEmpty();

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

@ -245,7 +245,7 @@ public class OrcaServiceImplTest {
public void testApis() throws Exception { public void testApis() throws Exception {
ImmutableMap<String, Double> firstUtilization = ImmutableMap.of("util", 0.1); ImmutableMap<String, Double> firstUtilization = ImmutableMap.of("util", 0.1);
OrcaLoadReport goldenReport = OrcaLoadReport.newBuilder() OrcaLoadReport goldenReport = OrcaLoadReport.newBuilder()
.setCpuUtilization(random.nextDouble()) .setCpuUtilization(random.nextDouble() * 10)
.setMemUtilization(random.nextDouble()) .setMemUtilization(random.nextDouble())
.putAllUtilization(firstUtilization) .putAllUtilization(firstUtilization)
.putUtilization("queue", 1.0) .putUtilization("queue", 1.0)
@ -276,7 +276,6 @@ public class OrcaServiceImplTest {
assertThat(reports.next()).isEqualTo(goldenReport); assertThat(reports.next()).isEqualTo(goldenReport);
defaultTestService.setCpuUtilizationMetric(-0.001); defaultTestService.setCpuUtilizationMetric(-0.001);
defaultTestService.setCpuUtilizationMetric(1.001);
defaultTestService.setMemoryUtilizationMetric(-0.001); defaultTestService.setMemoryUtilizationMetric(-0.001);
defaultTestService.setMemoryUtilizationMetric(1.001); defaultTestService.setMemoryUtilizationMetric(1.001);
defaultTestService.setQpsMetric(-0.001); defaultTestService.setQpsMetric(-0.001);