core: OutlierDetectionLoadBalancer to pass child LB config. (#9467) (#…

…9474)
grpc · Aug 22, 2022 · 184fdaa · 184fdaa
1 parent ac20c19
commit 184fdaa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/core/src/main/java/io/grpc/util/OutlierDetectionLoadBalancer.java b/core/src/main/java/io/grpc/util/OutlierDetectionLoadBalancer.java
@@ -139,7 +139,9 @@ public void handleResolvedAddresses(ResolvedAddresses resolvedAddresses) {
       trackerMap.cancelTracking();
     }
 
-    switchLb.handleResolvedAddresses(resolvedAddresses);
+    switchLb.handleResolvedAddresses(
+        resolvedAddresses.toBuilder().setLoadBalancingPolicyConfig(config.childPolicy.getConfig())
+            .build());
   }
 
   @Override

diff --git a/core/src/test/java/io/grpc/util/OutlierDetectionLoadBalancerTest.java b/core/src/test/java/io/grpc/util/OutlierDetectionLoadBalancerTest.java
@@ -233,7 +233,9 @@ public void handleResolvedAddresses() {
     loadBalancer.handleResolvedAddresses(resolvedAddresses);
 
     // Handling of resolved addresses is delegated
-    verify(mockChildLb).handleResolvedAddresses(resolvedAddresses);
+    verify(mockChildLb).handleResolvedAddresses(
+        resolvedAddresses.toBuilder().setLoadBalancingPolicyConfig(config.childPolicy.getConfig())
+            .build());
 
     // There is a single pending task to run the outlier detection algorithm
     assertThat(fakeClock.getPendingTasks()).hasSize(1);