[jboss-cvs] JBossAS SVN: r109321 - in branches/6.0.0.20101110-CR1: testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Nov 13 16:56:14 EST 2010
Author: pferraro
Date: 2010-11-13 16:56:13 -0500 (Sat, 13 Nov 2010)
New Revision: 109321
Modified:
branches/6.0.0.20101110-CR1/component-matrix/pom.xml
branches/6.0.0.20101110-CR1/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionCountUnitTestCase.java
branches/6.0.0.20101110-CR1/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java
Log:
Merge SessionCountUnitTestCase fixes from trunk
Modified: branches/6.0.0.20101110-CR1/component-matrix/pom.xml
===================================================================
--- branches/6.0.0.20101110-CR1/component-matrix/pom.xml 2010-11-13 21:50:28 UTC (rev 109320)
+++ branches/6.0.0.20101110-CR1/component-matrix/pom.xml 2010-11-13 21:56:13 UTC (rev 109321)
@@ -79,9 +79,9 @@
<version.org.jboss.cluster.client>1.1.2.Final</version.org.jboss.cluster.client>
<version.org.jboss.cluster.server.api>2.0.0.CR1</version.org.jboss.cluster.server.api>
<version.org.jboss.cluster.server.core>1.0.0.CR1</version.org.jboss.cluster.server.core>
- <version.org.jboss.cluster.server.ispn>1.0.0.CR5</version.org.jboss.cluster.server.ispn>
+ <version.org.jboss.cluster.server.ispn>1.0.0.CR6</version.org.jboss.cluster.server.ispn>
<version.org.jboss.cluster.cache.spi>3.0.0.CR1</version.org.jboss.cluster.cache.spi>
- <version.org.jboss.cluster.cache.ispn>1.0.0.CR6</version.org.jboss.cluster.cache.ispn>
+ <version.org.jboss.cluster.cache.ispn>1.0.0.CR7</version.org.jboss.cluster.cache.ispn>
<version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
<version.org.jboss.deployers>2.2.0.Alpha8</version.org.jboss.deployers>
<version.org.jboss.ejb3.depchain>1.0.0-alpha-17</version.org.jboss.ejb3.depchain>
Modified: branches/6.0.0.20101110-CR1/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionCountUnitTestCase.java
===================================================================
--- branches/6.0.0.20101110-CR1/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionCountUnitTestCase.java 2010-11-13 21:50:28 UTC (rev 109320)
+++ branches/6.0.0.20101110-CR1/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionCountUnitTestCase.java 2010-11-13 21:56:13 UTC (rev 109321)
@@ -46,7 +46,7 @@
{
private static final Logger log = Logger.getLogger(SessionCountUnitTestCase.class);
- private static long testCount = System.currentTimeMillis();
+ private static int managerIndex = 1;
private JGroupsSystemPropertySupport jgroupsSupport;
private EmbeddedCacheManager[] cacheContainers = new EmbeddedCacheManager[2];
@@ -134,14 +134,14 @@
{
log.info("Enter testStandaloneMaxSessions");
- ++testCount;
+ String warName = "test" + ++managerIndex;
cacheContainers[0] = SessionTestUtil.createCacheContainer(true, null, false, false);
cacheContainers[0].start();
- managers[0] = SessionTestUtil.createManager("test" + testCount, 5, cacheContainers[0], null);
+ managers[0] = SessionTestUtil.createManager(warName, 5, cacheContainers[0], null);
JBossWebMetaData webMetaData = SessionTestUtil.createWebMetaData(2);
- managers[0].init("test.war", webMetaData);
+ managers[0].init(warName, webMetaData);
managers[0].start();
@@ -179,14 +179,14 @@
{
log.info("Enter testStandaloneMaxSessionsWithMaxIdle");
- ++testCount;
- String passDir = getPassivationDir(testCount, 1);
+ String warName = "test" + ++managerIndex;
+ String passDir = getPassivationDir(managerIndex, 1);
cacheContainers[0] = SessionTestUtil.createCacheContainer(true, passDir, false, false);
cacheContainers[0].start();
- managers[0] = SessionTestUtil.createManager("test" + testCount, 5, cacheContainers[0], null);
+ managers[0] = SessionTestUtil.createManager(warName, 5, cacheContainers[0], null);
JBossWebMetaData webMetaData = SessionTestUtil.createWebMetaData(1, true, 1, -1);
- managers[0].init("test.war", webMetaData);
+ managers[0].init(warName, webMetaData);
managers[0].start();
@@ -234,14 +234,14 @@
{
log.info("Enter testStandaloneMaxSessionsWithMinIdle");
- ++testCount;
- String passDir = getPassivationDir(testCount, 1);
+ String warName = "test" + ++managerIndex;
+ String passDir = getPassivationDir(managerIndex, 1);
cacheContainers[0] = SessionTestUtil.createCacheContainer(true, passDir, false, false);
cacheContainers[0].start();
- managers[0] = SessionTestUtil.createManager("test" + testCount, 5, cacheContainers[0], null);
+ managers[0] = SessionTestUtil.createManager(warName, 5, cacheContainers[0], null);
JBossWebMetaData webMetaData = SessionTestUtil.createWebMetaData(1, true, 3, 1);
- managers[0].init("test.war", webMetaData);
+ managers[0].init(warName, webMetaData);
managers[0].start();
@@ -289,15 +289,15 @@
{
log.info("Enter testReplicatedMaxSessions");
- ++testCount;
+ String warName = "test" + ++managerIndex;
JBossWebMetaData webMetaData = SessionTestUtil.createWebMetaData(1);
for (int i = 0; i < cacheContainers.length; ++i)
{
cacheContainers[i] = SessionTestUtil.createCacheContainer(false, null, false, false);
cacheContainers[i].start();
- managers[i] = SessionTestUtil.createManager("test" + testCount, 1, cacheContainers[i], null);
- managers[i].init("test.war", webMetaData);
+ managers[i] = SessionTestUtil.createManager(warName, 1, cacheContainers[i], null);
+ managers[i].init(warName, webMetaData);
managers[i].start();
assertFalse("Passivation is disabled", managers[i].isPassivationEnabled());
@@ -338,16 +338,16 @@
{
log.info("Enter testReplicatedMaxSessionsWithMaxIdle");
- ++testCount;
+ String warName = "test" + ++managerIndex;
JBossWebMetaData webMetaData = SessionTestUtil.createWebMetaData(1, true, 1, -1);
for (int i = 0; i < cacheContainers.length; ++i)
{
- String passDir = getPassivationDir(testCount, i + 1);
+ String passDir = getPassivationDir(managerIndex, i + 1);
cacheContainers[i] = SessionTestUtil.createCacheContainer(false, passDir, false, false);
cacheContainers[i].start();
- managers[i] = SessionTestUtil.createManager("test" + testCount, 1, cacheContainers[i], null);
- managers[i].init("test.war", webMetaData);
+ managers[i] = SessionTestUtil.createManager(warName, 1, cacheContainers[i], null);
+ managers[i].init(warName, webMetaData);
managers[i].start();
assertTrue("Passivation is enabled", managers[i].isPassivationEnabled());
@@ -393,16 +393,16 @@
{
log.info("Enter testReplicatedMaxSessionsWithMinIdle");
- ++testCount;
+ String warName = "test" + ++managerIndex;
JBossWebMetaData webMetaData = SessionTestUtil.createWebMetaData(1, true, 3, 1);
for (int i = 0; i < cacheContainers.length; ++i)
{
- String passDir = getPassivationDir(testCount, i + 1);
+ String passDir = getPassivationDir(managerIndex, i + 1);
cacheContainers[i] = SessionTestUtil.createCacheContainer(false, passDir, false, false);
cacheContainers[i].start();
- managers[i] = SessionTestUtil.createManager("test" + testCount, 1, cacheContainers[i], null);
- managers[i].init("test.war", webMetaData);
+ managers[i] = SessionTestUtil.createManager(warName, 1, cacheContainers[i], null);
+ managers[i].init(warName, webMetaData);
managers[i].start();
assertTrue("Passivation is enabled", managers[i].isPassivationEnabled());
@@ -449,16 +449,16 @@
{
log.info("Enter testTotalReplication");
- ++testCount;
+ String warName = "test" + ++managerIndex;
JBossWebMetaData webMetaData = SessionTestUtil.createWebMetaData(1, true, 3, 1);
for (int i = 0; i < cacheContainers.length; ++i)
{
- String passDir = getPassivationDir(testCount, i + 1);
+ String passDir = getPassivationDir(managerIndex, i + 1);
cacheContainers[i] = SessionTestUtil.createCacheContainer(false, passDir, true, false);
cacheContainers[i].start();
- managers[i] = SessionTestUtil.createManager("test" + testCount, 1, cacheContainers[i], null);
- managers[i].init("test.war", webMetaData);
+ managers[i] = SessionTestUtil.createManager(warName, 1, cacheContainers[i], null);
+ managers[i].init(warName, webMetaData);
managers[i].start();
assertTrue("Passivation is enabled", managers[i].isPassivationEnabled());
@@ -514,14 +514,14 @@
private void standaloneWarRedeployTest(boolean restartCache)
throws Exception
{
- ++testCount;
- String passDir = getPassivationDir(testCount, 1);
+ String warName = "test" + ++managerIndex;
+ String passDir = getPassivationDir(managerIndex, 1);
cacheContainers[0] = SessionTestUtil.createCacheContainer(true, passDir, false, false);
cacheContainers[0].start();
- managers[0] = SessionTestUtil.createManager("test" + testCount, 300, cacheContainers[0], null);
+ managers[0] = SessionTestUtil.createManager(warName, 300, cacheContainers[0], null);
JBossWebMetaData webMetaData = SessionTestUtil.createWebMetaData(2, true, 3, 1);
- managers[0].init("test.war", webMetaData);
+ managers[0].init(warName, webMetaData);
managers[0].start();
@@ -563,13 +563,13 @@
{
cacheContainers[0].stop();
- passDir = getPassivationDir(testCount, 1);
+ passDir = getPassivationDir(managerIndex, 1);
cacheContainers[0] = SessionTestUtil.createCacheContainer(true, passDir, false, false);
}
- managers[0] = SessionTestUtil.createManager("test" + testCount, 5, cacheContainers[0], null);
+ managers[0] = SessionTestUtil.createManager(warName, 5, cacheContainers[0], null);
- managers[0].init("test.war", webMetaData);
+ managers[0].init(warName, webMetaData);
managers[0].start();
@@ -626,16 +626,16 @@
boolean purgeOnStartStop)
throws Exception
{
- ++testCount;
+ String warName = "test" + ++managerIndex;
JBossWebMetaData webMetaData = SessionTestUtil.createWebMetaData(2, true, 30, 1);
for (int i = 0; i < cacheContainers.length; ++i)
{
- String passDir = getPassivationDir(testCount, i + 1);
+ String passDir = getPassivationDir(managerIndex, i + 1);
cacheContainers[i] = SessionTestUtil.createCacheContainer(false, passDir, totalReplication, purgeOnStartStop);
cacheContainers[i].start();
- managers[i] = SessionTestUtil.createManager("test" + testCount, 300, cacheContainers[i], null);
- managers[i].init("test.war", webMetaData);
+ managers[i] = SessionTestUtil.createManager(warName, 300, cacheContainers[i], null);
+ managers[i].init(warName, webMetaData);
managers[i].start();
assertTrue("Passivation is enabled", managers[i].isPassivationEnabled());
@@ -699,14 +699,14 @@
{
cacheContainers[0].stop();
- String passDir = getPassivationDir(testCount, 1);
+ String passDir = getPassivationDir(managerIndex, 1);
cacheContainers[0] = SessionTestUtil.createCacheContainer(false, passDir, totalReplication, purgeOnStartStop);
cacheContainers[0].start();
}
- managers[0] = SessionTestUtil.createManager("test" + testCount, 300, cacheContainers[0], null);
+ managers[0] = SessionTestUtil.createManager(warName, 300, cacheContainers[0], null);
- managers[0].init("test.war", webMetaData);
+ managers[0].init(warName, webMetaData);
managers[0].start();
assertTrue("Passivation is enabled", managers[0].isPassivationEnabled());
Modified: branches/6.0.0.20101110-CR1/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java
===================================================================
--- branches/6.0.0.20101110-CR1/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java 2010-11-13 21:50:28 UTC (rev 109320)
+++ branches/6.0.0.20101110-CR1/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java 2010-11-13 21:56:13 UTC (rev 109321)
@@ -31,6 +31,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import javax.servlet.ServletException;
@@ -49,6 +50,7 @@
import org.infinispan.config.Configuration;
import org.infinispan.config.Configuration.CacheMode;
import org.infinispan.config.GlobalConfiguration;
+import org.infinispan.lifecycle.ComponentStatus;
import org.infinispan.loaders.CacheLoaderConfig;
import org.infinispan.loaders.file.FileCacheStoreConfig;
import org.infinispan.manager.CacheContainer;
@@ -107,7 +109,9 @@
@Override
public <K, V> Cache<K, V> getCache(LocalDistributableSessionManager manager)
{
- return cacheContainer.getCache(manager.getName());
+ Cache<K, V> cache = cacheContainer.getCache(manager.getName());
+ log.info("Using " + cache.getConfiguration().getCacheMode() + " mode cache for " + manager.getName());
+ return cache;
}
};
CacheSource jvmRouteCacheSource = new CacheSource()
@@ -134,59 +138,168 @@
return manager;
}
+
+ private static volatile int containerIndex = 1;
public static EmbeddedCacheManager createCacheContainer(boolean local, String passivationDir, boolean totalReplication, boolean purgeCacheLoader) throws Exception
{
- GlobalConfiguration globalConfig = local ? GlobalConfiguration.getNonClusteredDefault() : GlobalConfiguration.getClusteredDefault();
- globalConfig.setClusterName("testing");
- globalConfig.setStrictPeerToPeer(false);
+ GlobalConfiguration global = local ? GlobalConfiguration.getNonClusteredDefault() : GlobalConfiguration.getClusteredDefault();
+ global.setClusterName("testing");
+ global.setCacheManagerName("container" + containerIndex++);
+ global.setStrictPeerToPeer(false);
- Configuration defaultConfig = new Configuration();
- defaultConfig.setInvocationBatchingEnabled(true);
- defaultConfig.setIsolationLevel(IsolationLevel.REPEATABLE_READ);
- defaultConfig.setSyncReplTimeout(20000);
- defaultConfig.setLockAcquisitionTimeout(15000);
- defaultConfig.setCacheMode(local ? CacheMode.LOCAL : (totalReplication ? CacheMode.REPL_SYNC : CacheMode.DIST_SYNC));
+ Configuration config = new Configuration();
+ config.setInvocationBatchingEnabled(true);
+ config.setIsolationLevel(IsolationLevel.REPEATABLE_READ);
+ config.setSyncReplTimeout(20000);
+ config.setLockAcquisitionTimeout(15000);
+ config.setCacheMode(local ? CacheMode.LOCAL : (totalReplication ? CacheMode.REPL_SYNC : CacheMode.DIST_SYNC));
- CacheMode mode = defaultConfig.getCacheMode();
- defaultConfig.setFetchInMemoryState(mode.isReplicated());
+ CacheMode mode = config.getCacheMode();
+ config.setFetchInMemoryState(mode.isReplicated());
+
// Block for commits -- no races between test driver and replication
- defaultConfig.setSyncCommitPhase(true);
- defaultConfig.setSyncRollbackPhase(true);
+ config.setSyncCommitPhase(true);
+ config.setSyncRollbackPhase(true);
if (passivationDir != null)
{
CacheLoaderManagerConfig managerConfig = new CacheLoaderManagerConfig();
managerConfig.setPassivation(true);
- managerConfig.setPreload(true);
+ managerConfig.setPreload(!purgeCacheLoader);
FileCacheStoreConfig fileConfig = new FileCacheStoreConfig();
fileConfig.setLocation(passivationDir);
- fileConfig.setFetchPersistentState(!mode.isDistributed());
+ fileConfig.setFetchPersistentState(mode.isReplicated());
fileConfig.setPurgeOnStartup(purgeCacheLoader);
managerConfig.setCacheLoaderConfigs(Collections.<CacheLoaderConfig>singletonList(fileConfig));
- defaultConfig.setCacheLoaderManagerConfig(managerConfig);
+ config.setCacheLoaderManagerConfig(managerConfig);
}
- EmbeddedCacheManager container = new DefaultCacheManager(globalConfig, defaultConfig, false);
+ final EmbeddedCacheManager sessionContainer = new DefaultCacheManager(global, config, false);
- if (mode.isDistributed())
+ global = local ? GlobalConfiguration.getNonClusteredDefault() : GlobalConfiguration.getClusteredDefault();
+ global.setClusterName("testing-jvmroute");
+ global.setCacheManagerName("container" + containerIndex++);
+ global.setStrictPeerToPeer(false);
+
+ config = new Configuration();
+ config.setCacheMode(CacheMode.REPL_SYNC);
+ config.setFetchInMemoryState(true);
+ config.setSyncCommitPhase(true);
+ config.setSyncRollbackPhase(true);
+
+ final EmbeddedCacheManager jvmRouteContainer = new DefaultCacheManager(global, config, false);
+
+ return new EmbeddedCacheManager()
{
- Configuration config = new Configuration();
- config.setCacheMode(CacheMode.REPL_ASYNC);
- config.setFetchInMemoryState(true);
- CacheLoaderManagerConfig managerConfig = new CacheLoaderManagerConfig();
- managerConfig.setCacheLoaderConfigs(Collections.<CacheLoaderConfig>emptyList());
- managerConfig.setPassivation(false);
- config.setCacheLoaderManagerConfig(managerConfig);
+ @Override
+ public <K, V> Cache<K, V> getCache()
+ {
+ return sessionContainer.getCache();
+ }
- container.defineConfiguration("jboss.web", config);
- }
-
- return new DefaultCacheContainer(container);
+ @Override
+ public <K, V> Cache<K, V> getCache(String cacheName)
+ {
+ return cacheName.equals("jboss.web") ? jvmRouteContainer.<K, V>getCache() : sessionContainer.<K, V>getCache(cacheName);
+ }
+
+ @Override
+ public void start()
+ {
+ jvmRouteContainer.start();
+ sessionContainer.start();
+ }
+
+ @Override
+ public void stop()
+ {
+ sessionContainer.stop();
+ jvmRouteContainer.stop();
+ }
+
+ @Override
+ public void addListener(Object listener)
+ {
+ sessionContainer.addListener(listener);
+ }
+
+ @Override
+ public void removeListener(Object listener)
+ {
+ sessionContainer.removeListener(listener);
+ }
+
+ @Override
+ public Set<Object> getListeners()
+ {
+ return sessionContainer.getListeners();
+ }
+
+ @Override
+ public Configuration defineConfiguration(String cacheName, Configuration configurationOverride)
+ {
+ return sessionContainer.defineConfiguration(cacheName, configurationOverride);
+ }
+
+ @Override
+ public Configuration defineConfiguration(String cacheName, String templateCacheName, Configuration configurationOverride)
+ {
+ return sessionContainer.defineConfiguration(cacheName, templateCacheName, configurationOverride);
+ }
+
+ @Override
+ public String getClusterName()
+ {
+ return sessionContainer.getClusterName();
+ }
+
+ @Override
+ public List<Address> getMembers()
+ {
+ return sessionContainer.getMembers();
+ }
+
+ @Override
+ public Address getAddress()
+ {
+ return sessionContainer.getAddress();
+ }
+
+ @Override
+ public boolean isCoordinator()
+ {
+ return sessionContainer.isCoordinator();
+ }
+
+ @Override
+ public ComponentStatus getStatus()
+ {
+ return sessionContainer.getStatus();
+ }
+
+ @Override
+ public GlobalConfiguration getGlobalConfiguration()
+ {
+ return sessionContainer.getGlobalConfiguration();
+ }
+
+ @Override
+ public Configuration getDefaultConfiguration()
+ {
+ return sessionContainer.getDefaultConfiguration();
+ }
+
+ @Override
+ public Set<String> getCacheNames()
+ {
+ return sessionContainer.getCacheNames();
+ }
+ };
}
public static void setupContainer(String warName, String jvmRoute, Manager mgr)
More information about the jboss-cvs-commits
mailing list