You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by hi...@apache.org on 2016/06/07 19:06:23 UTC
[04/55] [abbrv] incubator-geode git commit: GEODE-1377: Initial move
of system properties from private to public
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java
index 4d69eb3..f0bbb9b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java
@@ -35,8 +35,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
/**
* Tests the GridAdvisor
@@ -77,81 +76,81 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
final Keeper bsKeeper4 = freeTCPPorts.get(5);
final int bsPort4 = bsKeeper4.getPort();
- final String host0 = NetworkUtils.getServerHostName(host);
- final String locators = host0 + "[" + port1 + "]" + ","
- + host0 + "[" + port2 + "]";
+ final String host0 = NetworkUtils.getServerHostName(host);
+ final String locators = host0 + "[" + port1 + "]" + ","
+ + host0 + "[" + port2 + "]";
final Properties dsProps = new Properties();
dsProps.setProperty(LOCATORS, locators);
dsProps.setProperty(MCAST_PORT, "0");
- dsProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
- dsProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
-
+ dsProps.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+ dsProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
+
keeper1.release();
vm0.invoke(new SerializableRunnable("Start locator on " + port1) {
- public void run() {
- File logFile = new File(getUniqueName() + "-locator" + port1
- + ".log");
- try {
- Locator.startLocatorAndDS(port1, logFile, null, dsProps, true, true, null);
- } catch (IOException ex) {
- Assert.fail("While starting locator on port " + port1, ex);
- }
+ public void run() {
+ File logFile = new File(getUniqueName() + "-locator" + port1
+ + ".log");
+ try {
+ Locator.startLocatorAndDS(port1, logFile, null, dsProps, true, true, null);
+ } catch (IOException ex) {
+ Assert.fail("While starting locator on port " + port1, ex);
}
- });
-
+ }
+ });
+
//try { Thread.currentThread().sleep(4000); } catch (InterruptedException ie) { }
-
+
keeper2.release();
vm3.invoke(new SerializableRunnable("Start locators on " + port2) {
- public void run() {
- File logFile = new File(getUniqueName() + "-locator" +
- port2 + ".log");
- try {
- Locator.startLocatorAndDS(port2, logFile, null, dsProps, true, true, "locator2HNFC");
+ public void run() {
+ File logFile = new File(getUniqueName() + "-locator" +
+ port2 + ".log");
+ try {
+ Locator.startLocatorAndDS(port2, logFile, null, dsProps, true, true, "locator2HNFC");
- } catch (IOException ex) {
- Assert.fail("While starting locator on port " + port2, ex);
- }
+ } catch (IOException ex) {
+ Assert.fail("While starting locator on port " + port2, ex);
}
- });
+ }
+ });
SerializableRunnable connect =
- new SerializableRunnable("Connect to " + locators) {
+ new SerializableRunnable("Connect to " + locators) {
public void run() {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, locators);
- dsProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+ dsProps.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
CacheFactory.create(DistributedSystem.connect(props));
}
};
vm1.invoke(connect);
vm2.invoke(connect);
SerializableRunnable startBS1 =
- new SerializableRunnable("start bridgeServer on " + bsPort1) {
- public void run() {
- try {
- Cache c = CacheFactory.getAnyInstance();
- CacheServer bs = c.addCacheServer();
- bs.setPort(bsPort1);
- bs.setGroups(new String[] {"bs1Group1", "bs1Group2"});
- bs.start();
- } catch (IOException ex) {
- RuntimeException re = new RuntimeException();
- re.initCause(ex);
- throw re;
+ new SerializableRunnable("start bridgeServer on " + bsPort1) {
+ public void run() {
+ try {
+ Cache c = CacheFactory.getAnyInstance();
+ CacheServer bs = c.addCacheServer();
+ bs.setPort(bsPort1);
+ bs.setGroups(new String[] { "bs1Group1", "bs1Group2" });
+ bs.start();
+ } catch (IOException ex) {
+ RuntimeException re = new RuntimeException();
+ re.initCause(ex);
+ throw re;
+ }
}
- }
- };
- SerializableRunnable startBS3 =
+ };
+ SerializableRunnable startBS3 =
new SerializableRunnable("start bridgeServer on " + bsPort3) {
public void run() {
try {
Cache c = CacheFactory.getAnyInstance();
CacheServer bs = c.addCacheServer();
bs.setPort(bsPort3);
- bs.setGroups(new String[] {"bs3Group1", "bs3Group2"});
+ bs.setGroups(new String[] { "bs3Group1", "bs3Group2" });
bs.start();
} catch (IOException ex) {
RuntimeException re = new RuntimeException();
@@ -172,7 +171,7 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
Cache c = CacheFactory.getAnyInstance();
CacheServer bs = c.addCacheServer();
bs.setPort(bsPort2);
- bs.setGroups(new String[] {"bs2Group1", "bs2Group2"});
+ bs.setGroups(new String[] { "bs2Group1", "bs2Group2" });
bs.start();
} catch (IOException ex) {
RuntimeException re = new RuntimeException();
@@ -188,7 +187,7 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
Cache c = CacheFactory.getAnyInstance();
CacheServer bs = c.addCacheServer();
bs.setPort(bsPort4);
- bs.setGroups(new String[] {"bs4Group1", "bs4Group2"});
+ bs.setGroups(new String[] { "bs4Group1", "bs4Group2" });
bs.start();
} catch (IOException ex) {
RuntimeException re = new RuntimeException();
@@ -200,220 +199,220 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
// verify that locators know about each other
vm0.invoke(new SerializableRunnable("Verify other locator on " + port2) {
- public void run() {
- assertTrue(Locator.hasLocator());
- InternalLocator l = (InternalLocator)Locator.getLocator();
- DistributionAdvisee advisee = l.getServerLocatorAdvisee();
- ControllerAdvisor ca = (ControllerAdvisor)advisee.getDistributionAdvisor();
- List others = ca.fetchControllers();
- assertEquals(1, others.size());
- {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(0);
- assertEquals(port2, cp.getPort());
- assertEquals("locator2HNFC", cp.getHost());
- }
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ InternalLocator l = (InternalLocator) Locator.getLocator();
+ DistributionAdvisee advisee = l.getServerLocatorAdvisee();
+ ControllerAdvisor ca = (ControllerAdvisor) advisee.getDistributionAdvisor();
+ List others = ca.fetchControllers();
+ assertEquals(1, others.size());
+ {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(0);
+ assertEquals(port2, cp.getPort());
+ assertEquals("locator2HNFC", cp.getHost());
+ }
- others = ca.fetchBridgeServers();
- assertEquals(4, others.size());
- for (int j=0; j < others.size(); j++) {
- CacheServerAdvisor.CacheServerProfile bsp =
- (CacheServerAdvisor.CacheServerProfile)others.get(j);
- if (bsp.getPort() == bsPort1) {
- assertEquals(Arrays.asList(new String[] {"bs1Group1", "bs1Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort2) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort3) {
- assertEquals(Arrays.asList(new String[] {"bs3Group1", "bs3Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort4) {
- assertEquals(Arrays.asList(new String[] {"bs4Group1", "bs4Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else {
- fail("unexpected port " + bsp.getPort() + " in " + bsp);
- }
- }
+ others = ca.fetchBridgeServers();
+ assertEquals(4, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ CacheServerAdvisor.CacheServerProfile bsp =
+ (CacheServerAdvisor.CacheServerProfile) others.get(j);
+ if (bsp.getPort() == bsPort1) {
+ assertEquals(Arrays.asList(new String[] { "bs1Group1", "bs1Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort2) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort3) {
+ assertEquals(Arrays.asList(new String[] { "bs3Group1", "bs3Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort4) {
+ assertEquals(Arrays.asList(new String[] { "bs4Group1", "bs4Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else {
+ fail("unexpected port " + bsp.getPort() + " in " + bsp);
+ }
}
- });
+ }
+ });
vm3.invoke(new SerializableRunnable("Verify other locator on " + port1) {
- public void run() {
- assertTrue(Locator.hasLocator());
- InternalLocator l = (InternalLocator)Locator.getLocator();
- DistributionAdvisee advisee = l.getServerLocatorAdvisee();
- ControllerAdvisor ca = (ControllerAdvisor)advisee.getDistributionAdvisor();
- List others = ca.fetchControllers();
- assertEquals(1, others.size());
- {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(0);
- assertEquals(port1, cp.getPort());
- }
- others = ca.fetchBridgeServers();
- assertEquals(4, others.size());
- for (int j=0; j < others.size(); j++) {
- CacheServerAdvisor.CacheServerProfile bsp =
- (CacheServerAdvisor.CacheServerProfile)others.get(j);
- if (bsp.getPort() == bsPort1) {
- assertEquals(Arrays.asList(new String[] {"bs1Group1", "bs1Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort2) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort3) {
- assertEquals(Arrays.asList(new String[] {"bs3Group1", "bs3Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort4) {
- assertEquals(Arrays.asList(new String[] {"bs4Group1", "bs4Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else {
- fail("unexpected port " + bsp.getPort() + " in " + bsp);
- }
- }
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ InternalLocator l = (InternalLocator) Locator.getLocator();
+ DistributionAdvisee advisee = l.getServerLocatorAdvisee();
+ ControllerAdvisor ca = (ControllerAdvisor) advisee.getDistributionAdvisor();
+ List others = ca.fetchControllers();
+ assertEquals(1, others.size());
+ {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(0);
+ assertEquals(port1, cp.getPort());
}
- });
+ others = ca.fetchBridgeServers();
+ assertEquals(4, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ CacheServerAdvisor.CacheServerProfile bsp =
+ (CacheServerAdvisor.CacheServerProfile) others.get(j);
+ if (bsp.getPort() == bsPort1) {
+ assertEquals(Arrays.asList(new String[] { "bs1Group1", "bs1Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort2) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort3) {
+ assertEquals(Arrays.asList(new String[] { "bs3Group1", "bs3Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort4) {
+ assertEquals(Arrays.asList(new String[] { "bs4Group1", "bs4Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else {
+ fail("unexpected port " + bsp.getPort() + " in " + bsp);
+ }
+ }
+ }
+ });
vm1.invoke(new SerializableRunnable("Verify bridge server view on " + bsPort1 + " and on " + bsPort3) {
- public void run() {
- Cache c = CacheFactory.getAnyInstance();
- List bslist = c.getCacheServers();
- assertEquals(2, bslist.size());
- for (int i=0; i < bslist.size(); i++) {
- DistributionAdvisee advisee = (DistributionAdvisee)bslist.get(i);
- CacheServerAdvisor bsa = (CacheServerAdvisor)advisee.getDistributionAdvisor();
- List others = bsa.fetchBridgeServers();
- LogWriterUtils.getLogWriter().info("found these bridgeservers in " + advisee + ": " + others);
- assertEquals(3, others.size());
- others = bsa.fetchControllers();
- assertEquals(2, others.size());
- for (int j=0; j < others.size(); j++) {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(j);
- if (cp.getPort() == port1) {
- // ok
- } else if (cp.getPort() == port2) {
- assertEquals("locator2HNFC", cp.getHost());
- // ok
- } else {
- fail("unexpected port " + cp.getPort() + " in " + cp);
- }
+ public void run() {
+ Cache c = CacheFactory.getAnyInstance();
+ List bslist = c.getCacheServers();
+ assertEquals(2, bslist.size());
+ for (int i = 0; i < bslist.size(); i++) {
+ DistributionAdvisee advisee = (DistributionAdvisee) bslist.get(i);
+ CacheServerAdvisor bsa = (CacheServerAdvisor) advisee.getDistributionAdvisor();
+ List others = bsa.fetchBridgeServers();
+ LogWriterUtils.getLogWriter().info("found these bridgeservers in " + advisee + ": " + others);
+ assertEquals(3, others.size());
+ others = bsa.fetchControllers();
+ assertEquals(2, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(j);
+ if (cp.getPort() == port1) {
+ // ok
+ } else if (cp.getPort() == port2) {
+ assertEquals("locator2HNFC", cp.getHost());
+ // ok
+ } else {
+ fail("unexpected port " + cp.getPort() + " in " + cp);
}
}
}
- });
+ }
+ });
vm2.invoke(new SerializableRunnable("Verify bridge server view on " + bsPort2 + " and on " + bsPort4) {
- public void run() {
- Cache c = CacheFactory.getAnyInstance();
- List bslist = c.getCacheServers();
- assertEquals(2, bslist.size());
- for (int i=0; i < bslist.size(); i++) {
- DistributionAdvisee advisee = (DistributionAdvisee)bslist.get(i);
- CacheServerAdvisor bsa = (CacheServerAdvisor)advisee.getDistributionAdvisor();
- List others = bsa.fetchBridgeServers();
- LogWriterUtils.getLogWriter().info("found these bridgeservers in " + advisee + ": " + others);
- assertEquals(3, others.size());
- others = bsa.fetchControllers();
- assertEquals(2, others.size());
- for (int j=0; j < others.size(); j++) {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(j);
- if (cp.getPort() == port1) {
- // ok
- } else if (cp.getPort() == port2) {
- assertEquals("locator2HNFC", cp.getHost());
- // ok
- } else {
- fail("unexpected port " + cp.getPort() + " in " + cp);
- }
+ public void run() {
+ Cache c = CacheFactory.getAnyInstance();
+ List bslist = c.getCacheServers();
+ assertEquals(2, bslist.size());
+ for (int i = 0; i < bslist.size(); i++) {
+ DistributionAdvisee advisee = (DistributionAdvisee) bslist.get(i);
+ CacheServerAdvisor bsa = (CacheServerAdvisor) advisee.getDistributionAdvisor();
+ List others = bsa.fetchBridgeServers();
+ LogWriterUtils.getLogWriter().info("found these bridgeservers in " + advisee + ": " + others);
+ assertEquals(3, others.size());
+ others = bsa.fetchControllers();
+ assertEquals(2, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(j);
+ if (cp.getPort() == port1) {
+ // ok
+ } else if (cp.getPort() == port2) {
+ assertEquals("locator2HNFC", cp.getHost());
+ // ok
+ } else {
+ fail("unexpected port " + cp.getPort() + " in " + cp);
}
}
}
- });
+ }
+ });
SerializableRunnable stopBS =
- new SerializableRunnable("stop bridge server") {
+ new SerializableRunnable("stop bridge server") {
public void run() {
Cache c = CacheFactory.getAnyInstance();
List bslist = c.getCacheServers();
assertEquals(2, bslist.size());
- CacheServer bs = (CacheServer)bslist.get(0);
+ CacheServer bs = (CacheServer) bslist.get(0);
bs.stop();
}
};
vm1.invoke(stopBS);
-
+
// now check to see if everyone else noticed him going away
vm0.invoke(new SerializableRunnable("Verify other locator on " + port2) {
- public void run() {
- assertTrue(Locator.hasLocator());
- InternalLocator l = (InternalLocator)Locator.getLocator();
- DistributionAdvisee advisee = l.getServerLocatorAdvisee();
- ControllerAdvisor ca = (ControllerAdvisor)advisee.getDistributionAdvisor();
- List others = ca.fetchControllers();
- assertEquals(1, others.size());
- {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(0);
- assertEquals(port2, cp.getPort());
- assertEquals("locator2HNFC", cp.getHost());
- }
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ InternalLocator l = (InternalLocator) Locator.getLocator();
+ DistributionAdvisee advisee = l.getServerLocatorAdvisee();
+ ControllerAdvisor ca = (ControllerAdvisor) advisee.getDistributionAdvisor();
+ List others = ca.fetchControllers();
+ assertEquals(1, others.size());
+ {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(0);
+ assertEquals(port2, cp.getPort());
+ assertEquals("locator2HNFC", cp.getHost());
+ }
- others = ca.fetchBridgeServers();
- assertEquals(3, others.size());
- for (int j=0; j < others.size(); j++) {
- CacheServerAdvisor.CacheServerProfile bsp =
- (CacheServerAdvisor.CacheServerProfile)others.get(j);
- if (bsp.getPort() == bsPort2) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort3) {
- assertEquals(Arrays.asList(new String[] {"bs3Group1", "bs3Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort4) {
- assertEquals(Arrays.asList(new String[] {"bs4Group1", "bs4Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else {
- fail("unexpected port " + bsp.getPort() + " in " + bsp);
- }
- }
+ others = ca.fetchBridgeServers();
+ assertEquals(3, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ CacheServerAdvisor.CacheServerProfile bsp =
+ (CacheServerAdvisor.CacheServerProfile) others.get(j);
+ if (bsp.getPort() == bsPort2) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort3) {
+ assertEquals(Arrays.asList(new String[] { "bs3Group1", "bs3Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort4) {
+ assertEquals(Arrays.asList(new String[] { "bs4Group1", "bs4Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else {
+ fail("unexpected port " + bsp.getPort() + " in " + bsp);
+ }
}
- });
+ }
+ });
vm3.invoke(new SerializableRunnable("Verify other locator on " + port1) {
- public void run() {
- assertTrue(Locator.hasLocator());
- InternalLocator l = (InternalLocator)Locator.getLocator();
- DistributionAdvisee advisee = l.getServerLocatorAdvisee();
- ControllerAdvisor ca = (ControllerAdvisor)advisee.getDistributionAdvisor();
- List others = ca.fetchControllers();
- assertEquals(1, others.size());
- {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(0);
- assertEquals(port1, cp.getPort());
- }
- others = ca.fetchBridgeServers();
- assertEquals(3, others.size());
- for (int j=0; j < others.size(); j++) {
- CacheServerAdvisor.CacheServerProfile bsp =
- (CacheServerAdvisor.CacheServerProfile)others.get(j);
- if (bsp.getPort() == bsPort2) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort3) {
- assertEquals(Arrays.asList(new String[] {"bs3Group1", "bs3Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort4) {
- assertEquals(Arrays.asList(new String[] {"bs4Group1", "bs4Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else {
- fail("unexpected port " + bsp.getPort() + " in " + bsp);
- }
- }
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ InternalLocator l = (InternalLocator) Locator.getLocator();
+ DistributionAdvisee advisee = l.getServerLocatorAdvisee();
+ ControllerAdvisor ca = (ControllerAdvisor) advisee.getDistributionAdvisor();
+ List others = ca.fetchControllers();
+ assertEquals(1, others.size());
+ {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(0);
+ assertEquals(port1, cp.getPort());
+ }
+ others = ca.fetchBridgeServers();
+ assertEquals(3, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ CacheServerAdvisor.CacheServerProfile bsp =
+ (CacheServerAdvisor.CacheServerProfile) others.get(j);
+ if (bsp.getPort() == bsPort2) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort3) {
+ assertEquals(Arrays.asList(new String[] { "bs3Group1", "bs3Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort4) {
+ assertEquals(Arrays.asList(new String[] { "bs4Group1", "bs4Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else {
+ fail("unexpected port " + bsp.getPort() + " in " + bsp);
+ }
}
- });
+ }
+ });
SerializableRunnable disconnect =
- new SerializableRunnable("Disconnect from " + locators) {
+ new SerializableRunnable("Disconnect from " + locators) {
public void run() {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
@@ -421,8 +420,8 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
DistributedSystem.connect(props).disconnect();
}
};
- SerializableRunnable stopLocator =
- new SerializableRunnable("Stop locator") {
+ SerializableRunnable stopLocator =
+ new SerializableRunnable("Stop locator") {
public void run() {
assertTrue(Locator.hasLocator());
Locator.getLocator().stop();
@@ -434,74 +433,74 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
// now make sure everyone else saw the locator go away
vm3.invoke(new SerializableRunnable("Verify locator stopped ") {
- public void run() {
- assertTrue(Locator.hasLocator());
- InternalLocator l = (InternalLocator)Locator.getLocator();
- DistributionAdvisee advisee = l.getServerLocatorAdvisee();
- ControllerAdvisor ca = (ControllerAdvisor)advisee.getDistributionAdvisor();
- List others = ca.fetchControllers();
- assertEquals(0, others.size());
- }
- });
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ InternalLocator l = (InternalLocator) Locator.getLocator();
+ DistributionAdvisee advisee = l.getServerLocatorAdvisee();
+ ControllerAdvisor ca = (ControllerAdvisor) advisee.getDistributionAdvisor();
+ List others = ca.fetchControllers();
+ assertEquals(0, others.size());
+ }
+ });
vm2.invoke(new SerializableRunnable("Verify bridge server saw locator stop") {
- public void run() {
- Cache c = CacheFactory.getAnyInstance();
- List bslist = c.getCacheServers();
- assertEquals(2, bslist.size());
- for (int i=0; i < bslist.size(); i++) {
- DistributionAdvisee advisee = (DistributionAdvisee)bslist.get(i);
- CacheServerAdvisor bsa = (CacheServerAdvisor)advisee.getDistributionAdvisor();
- List others = bsa.fetchControllers();
- assertEquals(1, others.size());
- for (int j=0; j < others.size(); j++) {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(j);
- if (cp.getPort() == port2) {
- assertEquals("locator2HNFC", cp.getHost());
- // ok
- } else {
- fail("unexpected port " + cp.getPort() + " in " + cp);
- }
+ public void run() {
+ Cache c = CacheFactory.getAnyInstance();
+ List bslist = c.getCacheServers();
+ assertEquals(2, bslist.size());
+ for (int i = 0; i < bslist.size(); i++) {
+ DistributionAdvisee advisee = (DistributionAdvisee) bslist.get(i);
+ CacheServerAdvisor bsa = (CacheServerAdvisor) advisee.getDistributionAdvisor();
+ List others = bsa.fetchControllers();
+ assertEquals(1, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(j);
+ if (cp.getPort() == port2) {
+ assertEquals("locator2HNFC", cp.getHost());
+ // ok
+ } else {
+ fail("unexpected port " + cp.getPort() + " in " + cp);
}
}
}
- });
+ }
+ });
vm1.invoke(new SerializableRunnable("Verify bridge server saw locator stop") {
- public void run() {
- Cache c = CacheFactory.getAnyInstance();
- List bslist = c.getCacheServers();
- assertEquals(2, bslist.size());
- for (int i=0; i < bslist.size(); i++) {
- DistributionAdvisee advisee = (DistributionAdvisee)bslist.get(i);
- if (i == 0) {
- // skip this one since it is stopped
- continue;
- }
- CacheServerAdvisor bsa = (CacheServerAdvisor)advisee.getDistributionAdvisor();
- List others = bsa.fetchControllers();
- assertEquals(1, others.size());
- for (int j=0; j < others.size(); j++) {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(j);
- if (cp.getPort() == port2) {
- assertEquals("locator2HNFC", cp.getHost());
- // ok
- } else {
- fail("unexpected port " + cp.getPort() + " in " + cp);
- }
+ public void run() {
+ Cache c = CacheFactory.getAnyInstance();
+ List bslist = c.getCacheServers();
+ assertEquals(2, bslist.size());
+ for (int i = 0; i < bslist.size(); i++) {
+ DistributionAdvisee advisee = (DistributionAdvisee) bslist.get(i);
+ if (i == 0) {
+ // skip this one since it is stopped
+ continue;
+ }
+ CacheServerAdvisor bsa = (CacheServerAdvisor) advisee.getDistributionAdvisor();
+ List others = bsa.fetchControllers();
+ assertEquals(1, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(j);
+ if (cp.getPort() == port2) {
+ assertEquals("locator2HNFC", cp.getHost());
+ // ok
+ } else {
+ fail("unexpected port " + cp.getPort() + " in " + cp);
}
}
}
- });
+ }
+ });
SerializableRunnable restartBS =
- new SerializableRunnable("restart bridge server") {
+ new SerializableRunnable("restart bridge server") {
public void run() {
try {
Cache c = CacheFactory.getAnyInstance();
List bslist = c.getCacheServers();
assertEquals(2, bslist.size());
- CacheServer bs = (CacheServer)bslist.get(0);
+ CacheServer bs = (CacheServer) bslist.get(0);
bs.setHostnameForClients("nameForClients");
bs.start();
} catch (IOException ex) {
@@ -513,56 +512,57 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
};
// restart bridge server 1 and see if controller sees it
vm1.invoke(restartBS);
-
+
vm3.invoke(new SerializableRunnable("Verify bridge server restart ") {
- public void run() {
- assertTrue(Locator.hasLocator());
- InternalLocator l = (InternalLocator)Locator.getLocator();
- DistributionAdvisee advisee = l.getServerLocatorAdvisee();
- ControllerAdvisor ca = (ControllerAdvisor)advisee.getDistributionAdvisor();
- assertEquals(0, ca.fetchControllers().size());
- List others = ca.fetchBridgeServers();
- assertEquals(4, others.size());
- for (int j=0; j < others.size(); j++) {
- CacheServerAdvisor.CacheServerProfile bsp =
- (CacheServerAdvisor.CacheServerProfile)others.get(j);
- if (bsp.getPort() == bsPort1) {
- assertEquals(Arrays.asList(new String[] {"bs1Group1", "bs1Group2"}),
- Arrays.asList(bsp.getGroups()));
- assertEquals("nameForClients", bsp.getHost());
- } else if (bsp.getPort() == bsPort2) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- assertFalse(bsp.getHost().equals("nameForClients"));
- } else if (bsp.getPort() == bsPort3) {
- assertEquals(Arrays.asList(new String[] {"bs3Group1", "bs3Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort4) {
- assertEquals(Arrays.asList(new String[] {"bs4Group1", "bs4Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else {
- fail("unexpected port " + bsp.getPort() + " in " + bsp);
- }
- }
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ InternalLocator l = (InternalLocator) Locator.getLocator();
+ DistributionAdvisee advisee = l.getServerLocatorAdvisee();
+ ControllerAdvisor ca = (ControllerAdvisor) advisee.getDistributionAdvisor();
+ assertEquals(0, ca.fetchControllers().size());
+ List others = ca.fetchBridgeServers();
+ assertEquals(4, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ CacheServerAdvisor.CacheServerProfile bsp =
+ (CacheServerAdvisor.CacheServerProfile) others.get(j);
+ if (bsp.getPort() == bsPort1) {
+ assertEquals(Arrays.asList(new String[] { "bs1Group1", "bs1Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ assertEquals("nameForClients", bsp.getHost());
+ } else if (bsp.getPort() == bsPort2) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ assertFalse(bsp.getHost().equals("nameForClients"));
+ } else if (bsp.getPort() == bsPort3) {
+ assertEquals(Arrays.asList(new String[] { "bs3Group1", "bs3Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort4) {
+ assertEquals(Arrays.asList(new String[] { "bs4Group1", "bs4Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else {
+ fail("unexpected port " + bsp.getPort() + " in " + bsp);
+ }
}
- });
+ }
+ });
vm1.invoke(disconnect);
vm2.invoke(disconnect);
// now make sure controller saw all bridge servers stop
vm3.invoke(new SerializableRunnable("Verify locator stopped ") {
- public void run() {
- assertTrue(Locator.hasLocator());
- InternalLocator l = (InternalLocator)Locator.getLocator();
- DistributionAdvisee advisee = l.getServerLocatorAdvisee();
- ControllerAdvisor ca = (ControllerAdvisor)advisee.getDistributionAdvisor();
- assertEquals(0, ca.fetchControllers().size());
- assertEquals(0, ca.fetchBridgeServers().size());
- }
- });
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ InternalLocator l = (InternalLocator) Locator.getLocator();
+ DistributionAdvisee advisee = l.getServerLocatorAdvisee();
+ ControllerAdvisor ca = (ControllerAdvisor) advisee.getDistributionAdvisor();
+ assertEquals(0, ca.fetchControllers().size());
+ assertEquals(0, ca.fetchBridgeServers().size());
+ }
+ });
vm3.invoke(stopLocator);
}
+
public void test2by2usingGroups() throws Exception {
disconnectAllFromDS();
@@ -586,44 +586,44 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
final Keeper bsKeeper4 = freeTCPPorts.get(5);
final int bsPort4 = bsKeeper4.getPort();
- final String host0 = NetworkUtils.getServerHostName(host);
- final String locators = host0 + "[" + port1 + "]" + ","
- + host0 + "[" + port2 + "]";
+ final String host0 = NetworkUtils.getServerHostName(host);
+ final String locators = host0 + "[" + port1 + "]" + ","
+ + host0 + "[" + port2 + "]";
final Properties dsProps = new Properties();
dsProps.setProperty(LOCATORS, locators);
dsProps.setProperty(MCAST_PORT, "0");
- dsProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
- dsProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
-
+ dsProps.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+ dsProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
+
keeper1.release();
vm0.invoke(new SerializableRunnable("Start locators on " + port1) {
- public void run() {
- File logFile = new File(getUniqueName() + "-locator" + port1
- + ".log");
- try {
- Locator.startLocatorAndDS(port1, logFile, null, dsProps, true, true, null);
- } catch (IOException ex) {
- Assert.fail("While starting locator on port " + port1, ex);
- }
+ public void run() {
+ File logFile = new File(getUniqueName() + "-locator" + port1
+ + ".log");
+ try {
+ Locator.startLocatorAndDS(port1, logFile, null, dsProps, true, true, null);
+ } catch (IOException ex) {
+ Assert.fail("While starting locator on port " + port1, ex);
}
- });
-
+ }
+ });
+
//try { Thread.currentThread().sleep(4000); } catch (InterruptedException ie) { }
-
+
keeper2.release();
vm3.invoke(new SerializableRunnable("Start locators on " + port2) {
- public void run() {
- File logFile = new File(getUniqueName() + "-locator" +
- port2 + ".log");
- try {
- Locator.startLocatorAndDS(port2, logFile, null, dsProps, true, true, "locator2HNFC");
+ public void run() {
+ File logFile = new File(getUniqueName() + "-locator" +
+ port2 + ".log");
+ try {
+ Locator.startLocatorAndDS(port2, logFile, null, dsProps, true, true, "locator2HNFC");
- } catch (IOException ex) {
- Assert.fail("While starting locator on port " + port2, ex);
- }
+ } catch (IOException ex) {
+ Assert.fail("While starting locator on port " + port2, ex);
}
- });
+ }
+ });
vm1.invoke(new SerializableRunnable("Connect to " + locators) {
public void run() {
@@ -631,7 +631,7 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, locators);
props.setProperty(DistributionConfig.GROUPS_NAME, "bs1Group1, bs1Group2");
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+ props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
CacheFactory.create(DistributedSystem.connect(props));
}
});
@@ -641,27 +641,27 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, locators);
props.setProperty(DistributionConfig.GROUPS_NAME, "bs2Group1, bs2Group2");
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+ props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
CacheFactory.create(DistributedSystem.connect(props));
}
});
SerializableRunnable startBS1 =
- new SerializableRunnable("start bridgeServer on " + bsPort1) {
- public void run() {
- try {
- Cache c = CacheFactory.getAnyInstance();
- CacheServer bs = c.addCacheServer();
- bs.setPort(bsPort1);
- bs.start();
- } catch (IOException ex) {
- RuntimeException re = new RuntimeException();
- re.initCause(ex);
- throw re;
+ new SerializableRunnable("start bridgeServer on " + bsPort1) {
+ public void run() {
+ try {
+ Cache c = CacheFactory.getAnyInstance();
+ CacheServer bs = c.addCacheServer();
+ bs.setPort(bsPort1);
+ bs.start();
+ } catch (IOException ex) {
+ RuntimeException re = new RuntimeException();
+ re.initCause(ex);
+ throw re;
+ }
}
- }
- };
- SerializableRunnable startBS3 =
+ };
+ SerializableRunnable startBS3 =
new SerializableRunnable("start bridgeServer on " + bsPort3) {
public void run() {
try {
@@ -714,305 +714,305 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
// verify that locators know about each other
vm0.invoke(new SerializableRunnable("Verify other locator on " + port2) {
- public void run() {
- assertTrue(Locator.hasLocator());
- InternalLocator l = (InternalLocator)Locator.getLocator();
- DistributionAdvisee advisee = l.getServerLocatorAdvisee();
- ControllerAdvisor ca = (ControllerAdvisor)advisee.getDistributionAdvisor();
- List others = ca.fetchControllers();
- assertEquals(1, others.size());
- {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(0);
- assertEquals(port2, cp.getPort());
- assertEquals("locator2HNFC", cp.getHost());
- }
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ InternalLocator l = (InternalLocator) Locator.getLocator();
+ DistributionAdvisee advisee = l.getServerLocatorAdvisee();
+ ControllerAdvisor ca = (ControllerAdvisor) advisee.getDistributionAdvisor();
+ List others = ca.fetchControllers();
+ assertEquals(1, others.size());
+ {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(0);
+ assertEquals(port2, cp.getPort());
+ assertEquals("locator2HNFC", cp.getHost());
+ }
- others = ca.fetchBridgeServers();
- assertEquals(4, others.size());
- for (int j=0; j < others.size(); j++) {
- CacheServerAdvisor.CacheServerProfile bsp =
- (CacheServerAdvisor.CacheServerProfile)others.get(j);
- if (bsp.getPort() == bsPort1) {
- assertEquals(Arrays.asList(new String[] {"bs1Group1", "bs1Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort2) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort3) {
- assertEquals(Arrays.asList(new String[] {"bs1Group1", "bs1Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort4) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else {
- fail("unexpected port " + bsp.getPort() + " in " + bsp);
- }
- }
+ others = ca.fetchBridgeServers();
+ assertEquals(4, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ CacheServerAdvisor.CacheServerProfile bsp =
+ (CacheServerAdvisor.CacheServerProfile) others.get(j);
+ if (bsp.getPort() == bsPort1) {
+ assertEquals(Arrays.asList(new String[] { "bs1Group1", "bs1Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort2) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort3) {
+ assertEquals(Arrays.asList(new String[] { "bs1Group1", "bs1Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort4) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else {
+ fail("unexpected port " + bsp.getPort() + " in " + bsp);
+ }
}
- });
+ }
+ });
vm3.invoke(new SerializableRunnable("Verify other locator on " + port1) {
- public void run() {
- assertTrue(Locator.hasLocator());
- InternalLocator l = (InternalLocator)Locator.getLocator();
- DistributionAdvisee advisee = l.getServerLocatorAdvisee();
- ControllerAdvisor ca = (ControllerAdvisor)advisee.getDistributionAdvisor();
- List others = ca.fetchControllers();
- assertEquals(1, others.size());
- {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(0);
- assertEquals(port1, cp.getPort());
- }
- others = ca.fetchBridgeServers();
- assertEquals(4, others.size());
- for (int j=0; j < others.size(); j++) {
- CacheServerAdvisor.CacheServerProfile bsp =
- (CacheServerAdvisor.CacheServerProfile)others.get(j);
- if (bsp.getPort() == bsPort1) {
- assertEquals(Arrays.asList(new String[] {"bs1Group1", "bs1Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort2) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort3) {
- assertEquals(Arrays.asList(new String[] {"bs1Group1", "bs1Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort4) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else {
- fail("unexpected port " + bsp.getPort() + " in " + bsp);
- }
- }
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ InternalLocator l = (InternalLocator) Locator.getLocator();
+ DistributionAdvisee advisee = l.getServerLocatorAdvisee();
+ ControllerAdvisor ca = (ControllerAdvisor) advisee.getDistributionAdvisor();
+ List others = ca.fetchControllers();
+ assertEquals(1, others.size());
+ {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(0);
+ assertEquals(port1, cp.getPort());
}
- });
+ others = ca.fetchBridgeServers();
+ assertEquals(4, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ CacheServerAdvisor.CacheServerProfile bsp =
+ (CacheServerAdvisor.CacheServerProfile) others.get(j);
+ if (bsp.getPort() == bsPort1) {
+ assertEquals(Arrays.asList(new String[] { "bs1Group1", "bs1Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort2) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort3) {
+ assertEquals(Arrays.asList(new String[] { "bs1Group1", "bs1Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort4) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else {
+ fail("unexpected port " + bsp.getPort() + " in " + bsp);
+ }
+ }
+ }
+ });
vm1.invoke(new SerializableRunnable("Verify bridge server view on " + bsPort1 + " and on " + bsPort3) {
- public void run() {
- Cache c = CacheFactory.getAnyInstance();
- List bslist = c.getCacheServers();
- assertEquals(2, bslist.size());
- for (int i=0; i < bslist.size(); i++) {
- DistributionAdvisee advisee = (DistributionAdvisee)bslist.get(i);
- CacheServerAdvisor bsa = (CacheServerAdvisor)advisee.getDistributionAdvisor();
- List others = bsa.fetchBridgeServers();
- LogWriterUtils.getLogWriter().info("found these bridgeservers in " + advisee + ": " + others);
- assertEquals(3, others.size());
- others = bsa.fetchControllers();
- assertEquals(2, others.size());
- for (int j=0; j < others.size(); j++) {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(j);
- if (cp.getPort() == port1) {
- // ok
- } else if (cp.getPort() == port2) {
- assertEquals("locator2HNFC", cp.getHost());
- // ok
- } else {
- fail("unexpected port " + cp.getPort() + " in " + cp);
- }
+ public void run() {
+ Cache c = CacheFactory.getAnyInstance();
+ List bslist = c.getCacheServers();
+ assertEquals(2, bslist.size());
+ for (int i = 0; i < bslist.size(); i++) {
+ DistributionAdvisee advisee = (DistributionAdvisee) bslist.get(i);
+ CacheServerAdvisor bsa = (CacheServerAdvisor) advisee.getDistributionAdvisor();
+ List others = bsa.fetchBridgeServers();
+ LogWriterUtils.getLogWriter().info("found these bridgeservers in " + advisee + ": " + others);
+ assertEquals(3, others.size());
+ others = bsa.fetchControllers();
+ assertEquals(2, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(j);
+ if (cp.getPort() == port1) {
+ // ok
+ } else if (cp.getPort() == port2) {
+ assertEquals("locator2HNFC", cp.getHost());
+ // ok
+ } else {
+ fail("unexpected port " + cp.getPort() + " in " + cp);
}
}
}
- });
+ }
+ });
vm2.invoke(new SerializableRunnable("Verify bridge server view on " + bsPort2 + " and on " + bsPort4) {
- public void run() {
- Cache c = CacheFactory.getAnyInstance();
- List bslist = c.getCacheServers();
- assertEquals(2, bslist.size());
- for (int i=0; i < bslist.size(); i++) {
- DistributionAdvisee advisee = (DistributionAdvisee)bslist.get(i);
- CacheServerAdvisor bsa = (CacheServerAdvisor)advisee.getDistributionAdvisor();
- List others = bsa.fetchBridgeServers();
- LogWriterUtils.getLogWriter().info("found these bridgeservers in " + advisee + ": " + others);
- assertEquals(3, others.size());
- others = bsa.fetchControllers();
- assertEquals(2, others.size());
- for (int j=0; j < others.size(); j++) {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(j);
- if (cp.getPort() == port1) {
- // ok
- } else if (cp.getPort() == port2) {
- assertEquals("locator2HNFC", cp.getHost());
- // ok
- } else {
- fail("unexpected port " + cp.getPort() + " in " + cp);
- }
+ public void run() {
+ Cache c = CacheFactory.getAnyInstance();
+ List bslist = c.getCacheServers();
+ assertEquals(2, bslist.size());
+ for (int i = 0; i < bslist.size(); i++) {
+ DistributionAdvisee advisee = (DistributionAdvisee) bslist.get(i);
+ CacheServerAdvisor bsa = (CacheServerAdvisor) advisee.getDistributionAdvisor();
+ List others = bsa.fetchBridgeServers();
+ LogWriterUtils.getLogWriter().info("found these bridgeservers in " + advisee + ": " + others);
+ assertEquals(3, others.size());
+ others = bsa.fetchControllers();
+ assertEquals(2, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(j);
+ if (cp.getPort() == port1) {
+ // ok
+ } else if (cp.getPort() == port2) {
+ assertEquals("locator2HNFC", cp.getHost());
+ // ok
+ } else {
+ fail("unexpected port " + cp.getPort() + " in " + cp);
}
}
}
- });
+ }
+ });
SerializableRunnable stopBS =
- new SerializableRunnable("stop bridge server") {
+ new SerializableRunnable("stop bridge server") {
public void run() {
Cache c = CacheFactory.getAnyInstance();
List bslist = c.getCacheServers();
assertEquals(2, bslist.size());
- CacheServer bs = (CacheServer)bslist.get(0);
+ CacheServer bs = (CacheServer) bslist.get(0);
bs.stop();
}
};
vm1.invoke(stopBS);
-
+
// now check to see if everyone else noticed him going away
vm0.invoke(new SerializableRunnable("Verify other locator on " + port2) {
- public void run() {
- assertTrue(Locator.hasLocator());
- InternalLocator l = (InternalLocator)Locator.getLocator();
- DistributionAdvisee advisee = l.getServerLocatorAdvisee();
- ControllerAdvisor ca = (ControllerAdvisor)advisee.getDistributionAdvisor();
- List others = ca.fetchControllers();
- assertEquals(1, others.size());
- {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(0);
- assertEquals(port2, cp.getPort());
- assertEquals("locator2HNFC", cp.getHost());
- }
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ InternalLocator l = (InternalLocator) Locator.getLocator();
+ DistributionAdvisee advisee = l.getServerLocatorAdvisee();
+ ControllerAdvisor ca = (ControllerAdvisor) advisee.getDistributionAdvisor();
+ List others = ca.fetchControllers();
+ assertEquals(1, others.size());
+ {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(0);
+ assertEquals(port2, cp.getPort());
+ assertEquals("locator2HNFC", cp.getHost());
+ }
- others = ca.fetchBridgeServers();
- assertEquals(3, others.size());
- for (int j=0; j < others.size(); j++) {
- CacheServerAdvisor.CacheServerProfile bsp =
- (CacheServerAdvisor.CacheServerProfile)others.get(j);
- if (bsp.getPort() == bsPort2) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort3) {
- assertEquals(Arrays.asList(new String[] {"bs1Group1", "bs1Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort4) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else {
- fail("unexpected port " + bsp.getPort() + " in " + bsp);
- }
- }
+ others = ca.fetchBridgeServers();
+ assertEquals(3, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ CacheServerAdvisor.CacheServerProfile bsp =
+ (CacheServerAdvisor.CacheServerProfile) others.get(j);
+ if (bsp.getPort() == bsPort2) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort3) {
+ assertEquals(Arrays.asList(new String[] { "bs1Group1", "bs1Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort4) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else {
+ fail("unexpected port " + bsp.getPort() + " in " + bsp);
+ }
}
- });
+ }
+ });
vm3.invoke(new SerializableRunnable("Verify other locator on " + port1) {
- public void run() {
- assertTrue(Locator.hasLocator());
- InternalLocator l = (InternalLocator)Locator.getLocator();
- DistributionAdvisee advisee = l.getServerLocatorAdvisee();
- ControllerAdvisor ca = (ControllerAdvisor)advisee.getDistributionAdvisor();
- List others = ca.fetchControllers();
- assertEquals(1, others.size());
- {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(0);
- assertEquals(port1, cp.getPort());
- }
- others = ca.fetchBridgeServers();
- assertEquals(3, others.size());
- for (int j=0; j < others.size(); j++) {
- CacheServerAdvisor.CacheServerProfile bsp =
- (CacheServerAdvisor.CacheServerProfile)others.get(j);
- if (bsp.getPort() == bsPort2) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort3) {
- assertEquals(Arrays.asList(new String[] {"bs1Group1", "bs1Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort4) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else {
- fail("unexpected port " + bsp.getPort() + " in " + bsp);
- }
- }
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ InternalLocator l = (InternalLocator) Locator.getLocator();
+ DistributionAdvisee advisee = l.getServerLocatorAdvisee();
+ ControllerAdvisor ca = (ControllerAdvisor) advisee.getDistributionAdvisor();
+ List others = ca.fetchControllers();
+ assertEquals(1, others.size());
+ {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(0);
+ assertEquals(port1, cp.getPort());
}
- });
+ others = ca.fetchBridgeServers();
+ assertEquals(3, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ CacheServerAdvisor.CacheServerProfile bsp =
+ (CacheServerAdvisor.CacheServerProfile) others.get(j);
+ if (bsp.getPort() == bsPort2) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort3) {
+ assertEquals(Arrays.asList(new String[] { "bs1Group1", "bs1Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort4) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else {
+ fail("unexpected port " + bsp.getPort() + " in " + bsp);
+ }
+ }
+ }
+ });
SerializableRunnable disconnect =
- new SerializableRunnable("Disconnect from " + locators) {
+ new SerializableRunnable("Disconnect from " + locators) {
public void run() {
InternalDistributedSystem.getAnyInstance().disconnect();
}
};
- SerializableRunnable stopLocator =
- new SerializableRunnable("Stop locator") {
- public void run() {
- assertTrue(Locator.hasLocator());
- Locator.getLocator().stop();
- assertFalse(Locator.hasLocator());
- }
- };
+ SerializableRunnable stopLocator =
+ new SerializableRunnable("Stop locator") {
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ Locator.getLocator().stop();
+ assertFalse(Locator.hasLocator());
+ }
+ };
vm0.invoke(stopLocator);
// now make sure everyone else saw the locator go away
vm3.invoke(new SerializableRunnable("Verify locator stopped ") {
- public void run() {
- assertTrue(Locator.hasLocator());
- InternalLocator l = (InternalLocator)Locator.getLocator();
- DistributionAdvisee advisee = l.getServerLocatorAdvisee();
- ControllerAdvisor ca = (ControllerAdvisor)advisee.getDistributionAdvisor();
- List others = ca.fetchControllers();
- assertEquals(0, others.size());
- }
- });
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ InternalLocator l = (InternalLocator) Locator.getLocator();
+ DistributionAdvisee advisee = l.getServerLocatorAdvisee();
+ ControllerAdvisor ca = (ControllerAdvisor) advisee.getDistributionAdvisor();
+ List others = ca.fetchControllers();
+ assertEquals(0, others.size());
+ }
+ });
vm2.invoke(new SerializableRunnable("Verify bridge server saw locator stop") {
- public void run() {
- Cache c = CacheFactory.getAnyInstance();
- List bslist = c.getCacheServers();
- assertEquals(2, bslist.size());
- for (int i=0; i < bslist.size(); i++) {
- DistributionAdvisee advisee = (DistributionAdvisee)bslist.get(i);
- CacheServerAdvisor bsa = (CacheServerAdvisor)advisee.getDistributionAdvisor();
- List others = bsa.fetchControllers();
- assertEquals(1, others.size());
- for (int j=0; j < others.size(); j++) {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(j);
- if (cp.getPort() == port2) {
- assertEquals("locator2HNFC", cp.getHost());
- // ok
- } else {
- fail("unexpected port " + cp.getPort() + " in " + cp);
- }
+ public void run() {
+ Cache c = CacheFactory.getAnyInstance();
+ List bslist = c.getCacheServers();
+ assertEquals(2, bslist.size());
+ for (int i = 0; i < bslist.size(); i++) {
+ DistributionAdvisee advisee = (DistributionAdvisee) bslist.get(i);
+ CacheServerAdvisor bsa = (CacheServerAdvisor) advisee.getDistributionAdvisor();
+ List others = bsa.fetchControllers();
+ assertEquals(1, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(j);
+ if (cp.getPort() == port2) {
+ assertEquals("locator2HNFC", cp.getHost());
+ // ok
+ } else {
+ fail("unexpected port " + cp.getPort() + " in " + cp);
}
}
}
- });
+ }
+ });
vm1.invoke(new SerializableRunnable("Verify bridge server saw locator stop") {
- public void run() {
- Cache c = CacheFactory.getAnyInstance();
- List bslist = c.getCacheServers();
- assertEquals(2, bslist.size());
- for (int i=0; i < bslist.size(); i++) {
- DistributionAdvisee advisee = (DistributionAdvisee)bslist.get(i);
- if (i == 0) {
- // skip this one since it is stopped
- continue;
- }
- CacheServerAdvisor bsa = (CacheServerAdvisor)advisee.getDistributionAdvisor();
- List others = bsa.fetchControllers();
- assertEquals(1, others.size());
- for (int j=0; j < others.size(); j++) {
- ControllerAdvisor.ControllerProfile cp =
- (ControllerAdvisor.ControllerProfile)others.get(j);
- if (cp.getPort() == port2) {
- assertEquals("locator2HNFC", cp.getHost());
- // ok
- } else {
- fail("unexpected port " + cp.getPort() + " in " + cp);
- }
+ public void run() {
+ Cache c = CacheFactory.getAnyInstance();
+ List bslist = c.getCacheServers();
+ assertEquals(2, bslist.size());
+ for (int i = 0; i < bslist.size(); i++) {
+ DistributionAdvisee advisee = (DistributionAdvisee) bslist.get(i);
+ if (i == 0) {
+ // skip this one since it is stopped
+ continue;
+ }
+ CacheServerAdvisor bsa = (CacheServerAdvisor) advisee.getDistributionAdvisor();
+ List others = bsa.fetchControllers();
+ assertEquals(1, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ ControllerAdvisor.ControllerProfile cp =
+ (ControllerAdvisor.ControllerProfile) others.get(j);
+ if (cp.getPort() == port2) {
+ assertEquals("locator2HNFC", cp.getHost());
+ // ok
+ } else {
+ fail("unexpected port " + cp.getPort() + " in " + cp);
}
}
}
- });
+ }
+ });
SerializableRunnable restartBS =
- new SerializableRunnable("restart bridge server") {
+ new SerializableRunnable("restart bridge server") {
public void run() {
try {
Cache c = CacheFactory.getAnyInstance();
List bslist = c.getCacheServers();
assertEquals(2, bslist.size());
- CacheServer bs = (CacheServer)bslist.get(0);
+ CacheServer bs = (CacheServer) bslist.get(0);
bs.setHostnameForClients("nameForClients");
bs.start();
} catch (IOException ex) {
@@ -1024,54 +1024,54 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
};
// restart bridge server 1 and see if controller sees it
vm1.invoke(restartBS);
-
+
vm3.invoke(new SerializableRunnable("Verify bridge server restart ") {
- public void run() {
- assertTrue(Locator.hasLocator());
- InternalLocator l = (InternalLocator)Locator.getLocator();
- DistributionAdvisee advisee = l.getServerLocatorAdvisee();
- ControllerAdvisor ca = (ControllerAdvisor)advisee.getDistributionAdvisor();
- assertEquals(0, ca.fetchControllers().size());
- List others = ca.fetchBridgeServers();
- assertEquals(4, others.size());
- for (int j=0; j < others.size(); j++) {
- CacheServerAdvisor.CacheServerProfile bsp =
- (CacheServerAdvisor.CacheServerProfile)others.get(j);
- if (bsp.getPort() == bsPort1) {
- assertEquals(Arrays.asList(new String[] {"bs1Group1", "bs1Group2"}),
- Arrays.asList(bsp.getGroups()));
- assertEquals("nameForClients", bsp.getHost());
- } else if (bsp.getPort() == bsPort2) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- assertFalse(bsp.getHost().equals("nameForClients"));
- } else if (bsp.getPort() == bsPort3) {
- assertEquals(Arrays.asList(new String[] {"bs1Group1", "bs1Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else if (bsp.getPort() == bsPort4) {
- assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}),
- Arrays.asList(bsp.getGroups()));
- } else {
- fail("unexpected port " + bsp.getPort() + " in " + bsp);
- }
- }
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ InternalLocator l = (InternalLocator) Locator.getLocator();
+ DistributionAdvisee advisee = l.getServerLocatorAdvisee();
+ ControllerAdvisor ca = (ControllerAdvisor) advisee.getDistributionAdvisor();
+ assertEquals(0, ca.fetchControllers().size());
+ List others = ca.fetchBridgeServers();
+ assertEquals(4, others.size());
+ for (int j = 0; j < others.size(); j++) {
+ CacheServerAdvisor.CacheServerProfile bsp =
+ (CacheServerAdvisor.CacheServerProfile) others.get(j);
+ if (bsp.getPort() == bsPort1) {
+ assertEquals(Arrays.asList(new String[] { "bs1Group1", "bs1Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ assertEquals("nameForClients", bsp.getHost());
+ } else if (bsp.getPort() == bsPort2) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ assertFalse(bsp.getHost().equals("nameForClients"));
+ } else if (bsp.getPort() == bsPort3) {
+ assertEquals(Arrays.asList(new String[] { "bs1Group1", "bs1Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else if (bsp.getPort() == bsPort4) {
+ assertEquals(Arrays.asList(new String[] { "bs2Group1", "bs2Group2" }),
+ Arrays.asList(bsp.getGroups()));
+ } else {
+ fail("unexpected port " + bsp.getPort() + " in " + bsp);
+ }
}
- });
+ }
+ });
vm1.invoke(disconnect);
vm2.invoke(disconnect);
// now make sure controller saw all bridge servers stop
vm3.invoke(new SerializableRunnable("Verify locator stopped ") {
- public void run() {
- assertTrue(Locator.hasLocator());
- InternalLocator l = (InternalLocator)Locator.getLocator();
- DistributionAdvisee advisee = l.getServerLocatorAdvisee();
- ControllerAdvisor ca = (ControllerAdvisor)advisee.getDistributionAdvisor();
- assertEquals(0, ca.fetchControllers().size());
- assertEquals(0, ca.fetchBridgeServers().size());
- }
- });
+ public void run() {
+ assertTrue(Locator.hasLocator());
+ InternalLocator l = (InternalLocator) Locator.getLocator();
+ DistributionAdvisee advisee = l.getServerLocatorAdvisee();
+ ControllerAdvisor ca = (ControllerAdvisor) advisee.getDistributionAdvisor();
+ assertEquals(0, ca.fetchControllers().size());
+ assertEquals(0, ca.fetchBridgeServers().size());
+ }
+ });
vm3.invoke(stopLocator);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java
index cbba60b..aed01c1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java
@@ -23,7 +23,6 @@ import com.gemstone.gemfire.cache.persistence.PersistentID;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.distributed.DistributedMember;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.ClassBuilder;
import com.gemstone.gemfire.internal.FileUtil;
import com.gemstone.gemfire.internal.JarClassLoader;
@@ -36,6 +35,8 @@ import com.gemstone.gemfire.test.dunit.*;
import java.io.*;
import java.util.*;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/**
* Tests for the incremental backup feature.
*/
@@ -67,7 +68,7 @@ public class IncrementalBackupDUnitTest extends CacheTestCase {
private final SerializableRunnable createRegions = new SerializableRunnable() {
@Override
public void run() {
- Cache cache = getCache(new CacheFactory().set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()));
+ Cache cache = getCache(new CacheFactory().set(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel()));
cache.createDiskStoreFactory().setDiskDirs(getDiskDirs()).create("fooStore");
cache.createDiskStoreFactory().setDiskDirs(getDiskDirs()).create("barStore");
getRegionFactory(cache).setDiskStoreName("fooStore").create("fooRegion");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptDiskJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptDiskJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptDiskJUnitTest.java
index 4180a75..440bbf6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptDiskJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptDiskJUnitTest.java
@@ -34,8 +34,7 @@ import java.util.Properties;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicLong;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
@@ -72,10 +71,10 @@ public class InterruptDiskJUnitTest {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "config"); // to keep diskPerf logs smaller
- props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
- props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true");
- props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "stats.gfs");
+ props.setProperty(LOG_LEVEL, "config"); // to keep diskPerf logs smaller
+ props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
+ props.setProperty(ENABLE_TIME_STATISTICS, "true");
+ props.setProperty(STATISTIC_ARCHIVE_FILE, "stats.gfs");
ds = DistributedSystem.connect(props);
cache = CacheFactory.create(ds);
File diskStore = new File("diskStore");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsConserveSocketsFalseDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsConserveSocketsFalseDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsConserveSocketsFalseDUnitTest.java
index eaa6f57..95dd4a3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsConserveSocketsFalseDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsConserveSocketsFalseDUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.internal.cache;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
import java.util.Properties;
@@ -30,7 +30,7 @@ public class InterruptsConserveSocketsFalseDUnitTest extends
@Override
public Properties getDistributedSystemProperties() {
Properties props = super.getDistributedSystemProperties();
- props.setProperty(DistributionConfig.CONSERVE_SOCKETS_NAME, "false");
+ props.setProperty(CONSERVE_SOCKETS, "false");
return props;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
index 6e59e06..4c3b709 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
@@ -18,7 +18,6 @@ package com.gemstone.gemfire.internal.cache;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.lru.LRUStatistics;
import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
@@ -30,8 +29,7 @@ import org.junit.experimental.categories.Category;
import java.io.File;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
import static org.junit.Assert.*;
/**
@@ -82,7 +80,7 @@ public class LIFOEvictionAlgoEnabledRegionJUnitTest {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info"); // to keep diskPerf logs smaller
+ props.setProperty(LOG_LEVEL, "info"); // to keep diskPerf logs smaller
distributedSystem = DistributedSystem.connect(props);
cache = CacheFactory.create(distributedSystem);
assertNotNull(cache);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
index 4376c88..6fca17d 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
@@ -18,7 +18,6 @@ package com.gemstone.gemfire.internal.cache;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
import com.gemstone.gemfire.internal.cache.lru.LRUStatistics;
@@ -35,8 +34,7 @@ import java.io.File;
import java.util.Arrays;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
import static org.junit.Assert.*;
/**
@@ -95,7 +93,7 @@ public class LIFOEvictionAlgoMemoryEnabledRegionJUnitTest {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info"); // to keep diskPerf logs smaller
+ props.setProperty(LOG_LEVEL, "info"); // to keep diskPerf logs smaller
distributedSystem = DistributedSystem.connect(props);
cache = CacheFactory.create(distributedSystem);
assertNotNull(cache);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OfflineSnapshotJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OfflineSnapshotJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OfflineSnapshotJUnitTest.java
index 38123be..7f5f5b0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OfflineSnapshotJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OfflineSnapshotJUnitTest.java
@@ -25,7 +25,6 @@ import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.snapshot.RegionGenerator;
import com.gemstone.gemfire.cache.snapshot.RegionGenerator.RegionType;
import com.gemstone.gemfire.cache.snapshot.RegionGenerator.SerializationType;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Before;
@@ -37,7 +36,7 @@ import java.io.FilenameFilter;
import java.util.HashMap;
import java.util.Map;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
@Category(IntegrationTest.class)
public class OfflineSnapshotJUnitTest {
@@ -122,7 +121,7 @@ public class OfflineSnapshotJUnitTest {
public void reset() {
CacheFactory cf = new CacheFactory()
.set(MCAST_PORT, "0")
- .set(DistributionConfig.LOG_LEVEL_NAME, "error")
+ .set(LOG_LEVEL, "error")
.setPdxSerializer(new MyPdxSerializer())
.setPdxPersistent(true);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java
index b0e1fe6..6a6e2ba 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.internal.cache;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
import java.util.Properties;
@@ -37,7 +37,7 @@ public class PartitionedRegionAPIConserveSocketsFalseDUnitTest extends
public Properties getDistributedSystemProperties()
{
Properties ret = new Properties();
- ret.setProperty(DistributionConfig.CONSERVE_SOCKETS_NAME, "false");
+ ret.setProperty(CONSERVE_SOCKETS, "false");
return ret;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java
index 25aeccb..5621829 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java
@@ -20,11 +20,12 @@ import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheException;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.util.test.TestUtil;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
import java.util.Properties;
/**
@@ -50,7 +51,7 @@ public class PartitionedRegionCacheXMLExampleDUnitTest extends
Properties props = new Properties();
String xmlfilepath = TestUtil.getResourcePath(getClass(), "PartitionRegionCacheExample1.xml");
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, xmlfilepath);
+ props.setProperty(CACHE_XML_FILE, xmlfilepath);
getSystem(props);
cache = getCache();
@@ -105,7 +106,7 @@ public class PartitionedRegionCacheXMLExampleDUnitTest extends
Properties props = new Properties();
String xmlfilepath = TestUtil.getResourcePath(getClass(), "PartitionRegionCacheExample2.xml");
- props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, xmlfilepath);
+ props.setProperty(CACHE_XML_FILE, xmlfilepath);
getSystem(props);
cache = getCache();
}