xds: Properly assign picker. (#9201)

* xds: Properly assign picker. Fixes a bug where the picker was not getting used in RpcBehaviorLoadBalancer.
grpc · May 27, 2022 · 7e578ed · 7e578ed
1 parent a6b1476
commit 7e578ed
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/...op-testing/src/main/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProvider.java b/...op-testing/src/main/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProvider.java
@@ -61,9 +61,10 @@ public ConfigOrError parseLoadBalancingPolicyConfig(Map<String, ?> rawLoadBalanc
 
   @Override
   public LoadBalancer newLoadBalancer(Helper helper) {
-    return new RpcBehaviorLoadBalancer(helper,
+    RpcBehaviorHelper rpcBehaviorHelper = new RpcBehaviorHelper(helper);
+    return new RpcBehaviorLoadBalancer(rpcBehaviorHelper,
         LoadBalancerRegistry.getDefaultRegistry().getProvider("round_robin")
-            .newLoadBalancer(helper));
+            .newLoadBalancer(rpcBehaviorHelper));
   }
 
   @Override
@@ -99,8 +100,8 @@ static class RpcBehaviorLoadBalancer extends ForwardingLoadBalancer {
     private final RpcBehaviorHelper helper;
     private final LoadBalancer delegateLb;
 
-    RpcBehaviorLoadBalancer(Helper helper, LoadBalancer delegateLb) {
-      this.helper = new RpcBehaviorHelper(helper);
+    RpcBehaviorLoadBalancer(RpcBehaviorHelper helper, LoadBalancer delegateLb) {
+      this.helper = helper;
       this.delegateLb = delegateLb;
     }
 

diff --git a/...esting/src/test/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProviderTest.java b/...esting/src/test/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProviderTest.java
@@ -80,7 +80,8 @@ public void parseInvalidConfig() {
 
   @Test
   public void handleResolvedAddressesDelegated() {
-    RpcBehaviorLoadBalancer lb = new RpcBehaviorLoadBalancer(mockHelper, mockDelegateLb);
+    RpcBehaviorLoadBalancer lb = new RpcBehaviorLoadBalancer(new RpcBehaviorHelper(mockHelper),
+        mockDelegateLb);
     ResolvedAddresses resolvedAddresses = buildResolvedAddresses(buildConfig());
     lb.handleResolvedAddresses(resolvedAddresses);
     verify(mockDelegateLb).handleResolvedAddresses(resolvedAddresses);