From 3bec887669f0858d3178df766d360507fdf535e2 Mon Sep 17 00:00:00 2001 From: Daniel Liu Date: Wed, 7 Jun 2023 22:55:02 +0000 Subject: [PATCH] import cncf/xds using import.sh script --- xds/third_party/xds/import.sh | 2 +- .../proto/xds/data/orca/v3/orca_load_report.proto | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/xds/third_party/xds/import.sh b/xds/third_party/xds/import.sh index d11e44161c2..f759cb0d35f 100755 --- a/xds/third_party/xds/import.sh +++ b/xds/third_party/xds/import.sh @@ -18,7 +18,7 @@ set -e BRANCH=main # import VERSION from one of the google internal CLs -VERSION=32f1caf87195bf3390061c29f18987e51ca56a88 +VERSION=e9ce68804cb4e64cab5a52e3c8baf840d4ff87b7 GIT_REPO="https://github.com/cncf/xds.git" GIT_BASE_DIR=xds SOURCE_PROTO_BASE_DIR=xds diff --git a/xds/third_party/xds/src/main/proto/xds/data/orca/v3/orca_load_report.proto b/xds/third_party/xds/src/main/proto/xds/data/orca/v3/orca_load_report.proto index 4996164a325..53da75f78ac 100644 --- a/xds/third_party/xds/src/main/proto/xds/data/orca/v3/orca_load_report.proto +++ b/xds/third_party/xds/src/main/proto/xds/data/orca/v3/orca_load_report.proto @@ -14,8 +14,10 @@ import "validate/validate.proto"; message OrcaLoadReport { // CPU utilization expressed as a fraction of available CPU resources. This - // should be derived from the latest sample or measurement. - double cpu_utilization = 1 [(validate.rules).double.gte = 0, (validate.rules).double.lte = 1]; + // should be derived from the latest sample or measurement. The value may be + // larger than 1.0 when the usage exceeds the reporter dependent notion of + // soft limits. + double cpu_utilization = 1 [(validate.rules).double.gte = 0]; // Memory utilization expressed as a fraction of available memory // resources. This should be derived from the latest sample or measurement. @@ -45,4 +47,12 @@ message OrcaLoadReport { // Application specific opaque metrics. map named_metrics = 8; + + // Application specific utilization expressed as a fraction of available + // resources. For example, an application may report the max of CPU and memory + // utilization for better load balancing if it is both CPU and memory bound. + // This should be derived from the latest sample or measurement. + // The value may be larger than 1.0 when the usage exceeds the reporter + // dependent notion of soft limits. + double application_utilization = 9 [(validate.rules).double.gte = 0]; }