You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2016/02/22 22:44:25 UTC
[097/100] [abbrv] incubator-geode git commit: GEODE-870: Handling
multiple concurrent locator restarts. Elder locator nomination
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/dad8cfd8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/dad8cfd8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/dad8cfd8
Branch: refs/heads/feature/GEODE-870
Commit: dad8cfd83752886466e40449293388ba7456cd78
Parents: f7dd4fd
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Wed Feb 10 12:19:33 2016 +1100
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Tue Feb 23 07:26:42 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/dad8cfd8/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
index a6cfba4..d5fe5f8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
@@ -1443,8 +1443,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 + "]";
@@ -1497,7 +1497,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());
@@ -1521,7 +1521,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 + "]";
@@ -1549,7 +1549,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()));
@@ -1582,7 +1582,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);
}
}
});
@@ -1595,7 +1595,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);
}
}
});