xds: disable processing of UpstreamTlsContext in 1.30.x release branch (

#7149)
grpc · Jun 22, 2020 · dce154f · dce154f
1 parent adb0ba4
commit dce154f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/xds/src/main/java/io/grpc/xds/CdsLoadBalancer.java b/xds/src/main/java/io/grpc/xds/CdsLoadBalancer.java
@@ -290,7 +290,9 @@ public void onClusterChanged(ClusterUpdate newUpdate) {
               /* edsServiceName = */ newUpdate.getEdsServiceName(),
               /* lrsServerName = */ newUpdate.getLrsServerName(),
               new PolicySelection(lbProvider, ImmutableMap.<String, Object>of(), lbConfig));
-      updateSslContextProvider(newUpdate.getUpstreamTlsContext());
+      if (false) {
+        updateSslContextProvider(newUpdate.getUpstreamTlsContext());
+      }
       if (edsBalancer == null) {
         edsBalancer = lbRegistry.getProvider(EDS_POLICY_NAME).newLoadBalancer(helper);
       }

diff --git a/xds/src/test/java/io/grpc/xds/CdsLoadBalancerTest.java b/xds/src/test/java/io/grpc/xds/CdsLoadBalancerTest.java
@@ -76,6 +76,7 @@
 import java.util.List;
 import java.util.Map;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -338,6 +339,7 @@ public void handleCdsConfigUpdate() {
     assertThat(xdsClientPool.xdsClient).isNull();
   }
 
+  @Ignore
   @Test
   @SuppressWarnings({"unchecked"})
   public void handleCdsConfigUpdate_withUpstreamTlsContext()  {