GEODE-870: Handling multiple concurrent locator restarts. Elder locator nomination
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7d448aed Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7d448aed Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7d448aed Branch: refs/heads/feature/GEODE-870 Commit: 7d448aed66f1c83aed2e7a4673a63f68eec5e313 Parents: 3f00d86 Author: Udo Kohlmeyer <ukohlme...@pivotal.io> Authored: Wed Feb 10 12:19:33 2016 +1100 Committer: Udo Kohlmeyer <ukohlme...@pivotal.io> Committed: Wed Feb 17 14:59:54 2016 +1100 ---------------------------------------------------------------------- .../gemfire/distributed/LocatorDUnitTest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d448aed/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java index 3786ccb..321e6ec 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java @@ -1414,8 +1414,8 @@ public class LocatorDUnitTest extends DistributedTestCase { this.port1 = freeTCPPorts[0]; this.port2 = freeTCPPorts[1]; int port3 = freeTCPPorts[2]; - deleteLocatorStateFile(port1, port2, port3); - final String host0 = getServerHostName(host); + DistributedTestUtils.deleteLocatorStateFile(port1, port2, port3); + final String host0 = NetworkUtils.getServerHostName(host); final String locators = host0 + "[" + port1 + "]," + host0 + "[" + port2 + "]," + host0 + "[" + port3 + "]"; @@ -1468,7 +1468,7 @@ public class LocatorDUnitTest extends DistributedTestCase { return null; } }; - DistributedTestCase.waitForCriterion(waitCriterion, 10 * 1000, 200, true); + Wait.waitForCriterion(waitCriterion, 10 * 1000, 200, true); // three applications plus assertEquals(6, system.getDM().getViewMembers().size()); @@ -1492,7 +1492,7 @@ public class LocatorDUnitTest extends DistributedTestCase { return null; } }; - DistributedTestCase.waitForCriterion(waitCriterion, 10 * 1000, 200, true); + Wait.waitForCriterion(waitCriterion, 10 * 1000, 200, true); final String newLocators = host0 + "[" + port2 + "]," + host0 + "[" + port3 + "]"; @@ -1520,7 +1520,7 @@ public class LocatorDUnitTest extends DistributedTestCase { return null; } }; - DistributedTestCase.waitForCriterion(waitCriterion, 10 * 1000, 200, true); + Wait.waitForCriterion(waitCriterion, 10 * 1000, 200, true); int netviewId = vm1.invoke(() -> GMSJoinLeaveHelper.getViewId()); assertEquals(netviewId, (int) vm2.invoke(() -> GMSJoinLeaveHelper.getViewId())); @@ -1553,7 +1553,7 @@ public class LocatorDUnitTest extends DistributedTestCase { try { Locator.startLocatorAndDS((int) args[0], logFile, (Properties) args[1]); } catch (IOException ex) { - fail("While starting process on port " + args[0], ex); + com.gemstone.gemfire.test.dunit.Assert.fail("While starting process on port " + args[0], ex); } } }); @@ -1566,7 +1566,7 @@ public class LocatorDUnitTest extends DistributedTestCase { try { Locator.startLocatorAndDS((int) args[0], logFile, (Properties) args[1]); } catch (IOException ex) { - fail("While starting process on port " + args[0], ex); + com.gemstone.gemfire.test.dunit.Assert.fail("While starting process on port " + args[0], ex); } } });
