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

xds:fix cdsLoadBalancer2 childLb shutdown (#7971)

This commit is contained in:
yifeizhuang 2021-03-16 12:37:05 -07:00 committed by GitHub
parent be6192e82a
commit 71c4ef730e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xds/src/main/java/io/grpc/xds/CdsLoadBalancer2.java
View File

@ -129,6 +129,9 @@ final class CdsLoadBalancer2 extends LoadBalancer {
private void shutdown() { private void shutdown() {
root.shutdown(); root.shutdown();
if (childLb != null) {
childLb.shutdown();
}
} }
private void handleClusterDiscovered() { private void handleClusterDiscovered() {

1
xds/src/test/java/io/grpc/xds/CdsLoadBalancer2Test.java
View File

@ -139,6 +139,7 @@ public class CdsLoadBalancer2Test {
loadBalancer.shutdown(); loadBalancer.shutdown();
assertThat(xdsClient.watchers).isEmpty(); assertThat(xdsClient.watchers).isEmpty();
assertThat(xdsClientRefs).isEqualTo(0); assertThat(xdsClientRefs).isEqualTo(0);
assertThat(childBalancers).isEmpty();
} }
@Test @Test