This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a commit to branch feature/GEODE-7270 in repository https://gitbox.apache.org/repos/asf/geode.git
commit dac65278486ddfdb8bab0205d19da8f715c0e2e9 Author: zhouxh <[email protected]> AuthorDate: Thu Oct 10 17:51:42 2019 -0700 GEODE-7270: wait until expected sites are ready to make test stable --- .../geode/internal/cache/wan/WANTestBase.java | 3 +- .../cache/wan/misc/WanAutoDiscoveryDUnitTest.java | 65 ++++++++++++---------- 2 files changed, 37 insertions(+), 31 deletions(-) diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/WANTestBase.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/WANTestBase.java index 791fead..f842247 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/WANTestBase.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/WANTestBase.java @@ -3015,12 +3015,13 @@ public class WANTestBase extends DistributedTestCase { } public static void checkAllSiteMetaData( - Map<Integer, Set<InetSocketAddress>> dsIdToLocatorAddresses) { + Map<Integer, Set<InetSocketAddress>> dsIdToLocatorAddresses, final int siteSizeToCheck) { List<Locator> locatorsConfigured = Locator.getLocators(); Locator locator = locatorsConfigured.get(0); await().untilAsserted(() -> { Map<Integer, Set<DistributionLocatorId>> allSiteMetaData = ((InternalLocator) locator).getLocatorMembershipListener().getAllLocatorsInfo(); + assertThat(allSiteMetaData.size()).isEqualTo(siteSizeToCheck); for (Map.Entry<Integer, Set<InetSocketAddress>> entry : dsIdToLocatorAddresses.entrySet()) { Set<DistributionLocatorId> foundLocatorIds = allSiteMetaData.get(entry.getKey()); Set<InetSocketAddress> expectedLocators = entry.getValue(); diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java index c2c5021..c658d2a 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java @@ -124,10 +124,11 @@ public class WanAutoDiscoveryDUnitTest extends WANTestBase { .invoke(() -> WANTestBase.createSecondRemoteLocator(2, nyLocPort1, lnLocPort1)); locatorPorts.add(new InetSocketAddress("localhost", nyLocPort2)); - vm0.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort)); - vm1.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort)); - vm2.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort)); - vm3.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort)); + final int siteSizeToCheck = dsVsPort.size(); + vm0.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort, siteSizeToCheck)); + vm1.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort, siteSizeToCheck)); + vm2.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort, siteSizeToCheck)); + vm3.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort, siteSizeToCheck)); } /** @@ -156,10 +157,11 @@ public class WanAutoDiscoveryDUnitTest extends WANTestBase { () -> WANTestBase.createSecondRemoteLocatorWithAPI(2, nyLocPort1, lnLocPort1, "localhost")); locatorPorts.add(new InetSocketAddress("localhost", nyLocPort2)); - vm0.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort)); - vm1.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort)); - vm2.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort)); - vm3.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort)); + final int siteSizeToCheck = dsVsPort.size(); + vm0.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort, siteSizeToCheck)); + vm1.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort, siteSizeToCheck)); + vm2.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort, siteSizeToCheck)); + vm3.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort, siteSizeToCheck)); } /** @@ -195,10 +197,11 @@ public class WanAutoDiscoveryDUnitTest extends WANTestBase { (Integer) vm3.invoke(() -> WANTestBase.createFirstRemoteLocator(4, lnLocPort1)); locatorPorts.add(new InetSocketAddress("localhost", hkLocPort)); - vm0.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort)); - vm1.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort)); - vm2.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort)); - vm3.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort)); + final int siteSizeToCheck = dsVsPort.size(); + vm0.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort, siteSizeToCheck)); + vm1.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort, siteSizeToCheck)); + vm2.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort, siteSizeToCheck)); + vm3.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort, siteSizeToCheck)); } @Test @@ -224,10 +227,10 @@ public class WanAutoDiscoveryDUnitTest extends WANTestBase { (Integer) vm2.invoke(() -> WANTestBase.createFirstRemoteLocator(3, nyLocPort1)); locatorPorts.add(new InetSocketAddress("localhost", tkLocPort)); - - vm0.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort)); - vm1.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort)); - vm2.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort)); + final int siteSizeToCheck = dsVsPort.size(); + vm0.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort, siteSizeToCheck)); + vm1.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort, siteSizeToCheck)); + vm2.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort, siteSizeToCheck)); } @Category({WanTest.class}) @@ -279,10 +282,11 @@ public class WanAutoDiscoveryDUnitTest extends WANTestBase { locatorPortsln.add(new InetSocketAddress("localhost", (Integer) async[2].getReturnValue())); locatorPortsny.add(new InetSocketAddress("localhost", (Integer) async[3].getReturnValue())); - vm0.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort)); - vm1.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort)); - vm2.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort)); - vm3.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort)); + final int siteSizeToCheck = dsVsPort.size(); + vm0.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort, siteSizeToCheck)); + vm1.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort, siteSizeToCheck)); + vm2.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort, siteSizeToCheck)); + vm3.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort, siteSizeToCheck)); } @@ -499,8 +503,9 @@ public class WanAutoDiscoveryDUnitTest extends WANTestBase { (Integer) vm1.invoke(() -> WANTestBase.createSecondPeerLocator(1, lnLocPort1)); locatorPorts.add(new InetSocketAddress("localhost", lnLocPort2)); - vm0.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort)); - vm1.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort)); + final int siteSizeToCheck = dsVsPort.size(); + vm0.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort, siteSizeToCheck)); + vm1.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort, siteSizeToCheck)); } @Test @@ -539,14 +544,14 @@ public class WanAutoDiscoveryDUnitTest extends WANTestBase { // pause(5000); - vm0.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort)); - vm1.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort)); - vm2.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort)); - vm3.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort)); - vm4.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort)); - vm5.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort)); - vm6.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort)); - + final int siteSizeToCheck = dsVsPort.size(); + vm0.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort, siteSizeToCheck)); + vm1.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort, siteSizeToCheck)); + vm2.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort, siteSizeToCheck)); + vm3.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort, siteSizeToCheck)); + vm4.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort, siteSizeToCheck)); + vm5.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort, siteSizeToCheck)); + vm6.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort, siteSizeToCheck)); } @Test
