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 a bug locality reset not fully clean up 

There is a bug in LocalityStore.reset() found during import.
This commit is contained in:
ZHANG Dapeng 2019-09-11 14:00:18 -07:00 committed by GitHub
parent e99672e03d
commit 842dfa49b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
xds/src/main/java/io/grpc/xds/LocalityStore.java
View File

@ -192,6 +192,7 @@ interface LocalityStore {
for (XdsLocality locality : edsResponsLocalityInfo.keySet()) { for (XdsLocality locality : edsResponsLocalityInfo.keySet()) {
loadStatsStore.removeLocality(locality); loadStatsStore.removeLocality(locality);
} }
edsResponsLocalityInfo = ImmutableMap.of();
} }
// This is triggered by EDS response. // This is triggered by EDS response.

9
xds/src/test/java/io/grpc/xds/LocalityStoreTest.java
View File

@ -831,6 +831,15 @@ public class LocalityStoreTest {
verify(loadBalancers.get("sz2")).shutdown(); verify(loadBalancers.get("sz2")).shutdown();
verify(loadStatsStore).removeLocality(locality1); verify(loadStatsStore).removeLocality(locality1);
verify(loadStatsStore).removeLocality(locality2); verify(loadStatsStore).removeLocality(locality2);
// Regression test for same locality added back.
localityStore.updateLocalityStore(localityInfoMap);
assertThat(loadBalancers).hasSize(2);
localityStore.reset();
verify(loadBalancers.get("sz1")).shutdown();
verify(loadBalancers.get("sz2")).shutdown();
verify(loadStatsStore, times(2)).removeLocality(locality1);
verify(loadStatsStore, times(2)).removeLocality(locality2);
} }
private static final class FakeLoadStatsStore implements LoadStatsStore { private static final class FakeLoadStatsStore implements LoadStatsStore {