GEODE-2732 after auto-reconnect a server is restarted on the default port Changes to the new test based on feedback from Galen
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/669d3ed1 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/669d3ed1 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/669d3ed1 Branch: refs/heads/feature/GEODE-2632 Commit: 669d3ed1f2ab7e05edfa15bb19b5782ebc05d753 Parents: 742c8f2 Author: Bruce Schuchardt <bschucha...@pivotal.io> Authored: Wed Apr 5 16:49:27 2017 -0700 Committer: Bruce Schuchardt <bschucha...@pivotal.io> Committed: Wed Apr 5 16:49:27 2017 -0700 ---------------------------------------------------------------------- .../cache30/ReconnectWithCacheXMLDUnitTest.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/669d3ed1/geode-core/src/test/java/org/apache/geode/cache30/ReconnectWithCacheXMLDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectWithCacheXMLDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ReconnectWithCacheXMLDUnitTest.java index 4f2fac1..2167a06 100755 --- a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectWithCacheXMLDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/ReconnectWithCacheXMLDUnitTest.java @@ -26,6 +26,8 @@ import org.apache.geode.distributed.internal.membership.MembershipTestHook; import org.apache.geode.distributed.internal.membership.gms.MembershipManagerHelper; import org.apache.geode.internal.AvailablePortHelper; import org.apache.geode.internal.cache.CacheServerLauncher; +import org.apache.geode.test.dunit.Wait; +import org.apache.geode.test.dunit.WaitCriterion; import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; import org.apache.geode.test.junit.categories.ClientServerTest; import org.apache.geode.test.junit.categories.DistributedTest; @@ -38,6 +40,11 @@ import java.util.Properties; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; +/** + * This test exercises auto-reconnect functionality when there is a cache-server that was started by + * gfsh but was configured both by gfsh and a cache.xml file. The JIRA ticket for this is + * GEODE-2732. + */ @Category({DistributedTest.class, MembershipTest.class, ClientServerTest.class}) public class ReconnectWithCacheXMLDUnitTest extends JUnit4CacheTestCase { @@ -96,6 +103,18 @@ public class ReconnectWithCacheXMLDUnitTest extends JUnit4CacheTestCase { MembershipManagerHelper.crashDistributedSystem(cache.getDistributedSystem()); assertTrue(membershipFailed.get()); + WaitCriterion wc = new WaitCriterion() { + @Override + public boolean done() { + return cache.getReconnectedCache() != null; + } + + @Override + public String description() { + return "waiting for cache to reconnect"; + } + }; + Wait.waitForCriterion(wc, 60000, 5000, true); await().atMost(60, TimeUnit.SECONDS).until(() -> cache.getReconnectedCache() != null); Cache newCache = cache.getReconnectedCache();
