grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xds: disable processing of UpstreamTlsContext until we are ready to test the feature (#7148)

This commit is contained in:
sanjaypujare 2020-06-22 14:33:41 -07:00 committed by GitHub
parent 69191ffc47
commit 8fb6591850
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xds/src/main/java/io/grpc/xds/CdsLoadBalancer.java
View File

@ -290,7 +290,9 @@ public final class CdsLoadBalancer extends LoadBalancer {
/* edsServiceName = */ newUpdate.getEdsServiceName(), /* edsServiceName = */ newUpdate.getEdsServiceName(),
/* lrsServerName = */ newUpdate.getLrsServerName(), /* lrsServerName = */ newUpdate.getLrsServerName(),
new PolicySelection(lbProvider, ImmutableMap.<String, Object>of(), lbConfig)); new PolicySelection(lbProvider, ImmutableMap.<String, Object>of(), lbConfig));
updateSslContextProvider(newUpdate.getUpstreamTlsContext()); if (false) {
updateSslContextProvider(newUpdate.getUpstreamTlsContext());
}
if (edsBalancer == null) { if (edsBalancer == null) {
edsBalancer = lbRegistry.getProvider(EDS_POLICY_NAME).newLoadBalancer(helper); edsBalancer = lbRegistry.getProvider(EDS_POLICY_NAME).newLoadBalancer(helper);
} }

2
xds/src/test/java/io/grpc/xds/CdsLoadBalancerTest.java
View File

@ -76,6 +76,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.JUnit4; import org.junit.runners.JUnit4;
@ -338,6 +339,7 @@ public class CdsLoadBalancerTest {
assertThat(xdsClientPool.xdsClient).isNull(); assertThat(xdsClientPool.xdsClient).isNull();
} }
@Ignore
@Test @Test
public void handleCdsConfigUpdate_withUpstreamTlsContext() { public void handleCdsConfigUpdate_withUpstreamTlsContext() {
assertThat(xdsClient).isNull(); assertThat(xdsClient).isNull();