Review comments.

Author: kannanjgithub

xds/src/main/java/io/grpc/xds/CdsLoadBalancer2.java

@@ -57,7 +57,7 @@ final class CdsLoadBalancer2 extends LoadBalancer {
   private final XdsLogger logger;
   private final Helper helper;
   private final LoadBalancerRegistry lbRegistry;
-  private final GracefulSwitchLoadBalancer delegate;
+  private GracefulSwitchLoadBalancer delegate;
   // Following fields are effectively final.
   private String clusterName;
   private Subscription clusterSubscription;
@@ -182,6 +182,7 @@ public void shutdown() {
       clusterSubscription.close();
       clusterSubscription = null;
     }
+    delegate = new GracefulSwitchLoadBalancer(helper);
   }
 
   @CheckReturnValue // don't forget to return up the stack after the fail call

xds/src/test/java/io/grpc/xds/CdsLoadBalancer2Test.java

@@ -474,22 +474,19 @@ public void discoverAggregateCluster_createsPriorityLbPolicy() {
     assertThat(childLbConfig.childConfigs).hasSize(3);
     PriorityLoadBalancerProvider.PriorityLbConfig.PriorityChildConfig childConfig3 =
             childLbConfig.childConfigs.get(cluster3);
-    assertThat(childConfig3.toString()).isEqualTo("PriorityChildConfig{childConfig="
-        + "GracefulSwitchLoadBalancer.Config{childFactory=CdsLoadBalancerProvider{"
-        + "policy=cds_experimental, priority=5, available=true}, childConfig=CdsConfig{"
-        + "name=cluster-03.googleapis.com, isDynamic=false}}, ignoreReresolution=false}");
+    assertThat(
+        GracefulSwitchLoadBalancerAccessor.getChildProvider(childConfig3.childConfig).getPolicyName())
+        .isEqualTo("cds_experimental");
     PriorityLoadBalancerProvider.PriorityLbConfig.PriorityChildConfig childConfig4 =
         childLbConfig.childConfigs.get(cluster4);
-    assertThat(childConfig4.toString()).isEqualTo("PriorityChildConfig{childConfig="
-        + "GracefulSwitchLoadBalancer.Config{childFactory=CdsLoadBalancerProvider{"
-        + "policy=cds_experimental, priority=5, available=true}, childConfig=CdsConfig{"
-        + "name=cluster-04.googleapis.com, isDynamic=false}}, ignoreReresolution=false}");
+    assertThat(
+        GracefulSwitchLoadBalancerAccessor.getChildProvider(childConfig4.childConfig).getPolicyName())
+        .isEqualTo("cds_experimental");
     PriorityLoadBalancerProvider.PriorityLbConfig.PriorityChildConfig childConfig2 =
             childLbConfig.childConfigs.get(cluster2);
-    assertThat(childConfig2.toString()).isEqualTo("PriorityChildConfig{childConfig="
-        + "GracefulSwitchLoadBalancer.Config{childFactory=CdsLoadBalancerProvider{"
-        + "policy=cds_experimental, priority=5, available=true}, childConfig=CdsConfig{"
-        + "name=cluster-02.googleapis.com, isDynamic=false}}, ignoreReresolution=false}");
+    assertThat(
+        GracefulSwitchLoadBalancerAccessor.getChildProvider(childConfig2.childConfig).getPolicyName())
+        .isEqualTo("cds_experimental");
   }
 
   @Test