xds: advertise send_all_clusters client feature in LRS requests (#7477)

grpc · Oct 1, 2020 · 594cc76 · 594cc76
1 parent ec0d01d
commit 594cc76
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/xds/src/main/java/io/grpc/xds/LoadReportClient.java b/xds/src/main/java/io/grpc/xds/LoadReportClient.java
@@ -84,9 +84,9 @@ final class LoadReportClient {
     this.syncContext = checkNotNull(syncContext, "syncContext");
     this.timerService = checkNotNull(scheduledExecutorService, "timeService");
     this.backoffPolicyProvider = checkNotNull(backoffPolicyProvider, "backoffPolicyProvider");
-    checkNotNull(stopwatchSupplier, "stopwatchSupplier");
-    this.retryStopwatch = stopwatchSupplier.get();
-    this.node = checkNotNull(node, "node");
+    this.retryStopwatch = checkNotNull(stopwatchSupplier, "stopwatchSupplier").get();
+    this.node = checkNotNull(node, "node").toBuilder()
+        .addClientFeatures("envoy.lrs.supports_send_all_clusters").build();
     logId = InternalLogId.allocate("lrs-client", targetName);
     logger = XdsLogger.withLogId(logId);
     logger.log(XdsLogLevel.INFO, "Created");

diff --git a/xds/src/test/java/io/grpc/xds/LoadReportClientTest.java b/xds/src/test/java/io/grpc/xds/LoadReportClientTest.java
@@ -465,6 +465,7 @@ private static LoadStatsRequest buildInitialRequest() {
             .setNode(
                 Node.newBuilder()
                     .setId("LRS test")
+                    .addClientFeatures("envoy.lrs.supports_send_all_clusters")
                     .setMetadata(
                         Struct.newBuilder()
                             .putFields(