[jboss-cvs] JBossAS SVN: r91219 - in trunk: testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jul 14 11:00:10 EDT 2009
Author: bstansberry at jboss.com
Date: 2009-07-14 11:00:09 -0400 (Tue, 14 Jul 2009)
New Revision: 91219
Added:
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/DriverManagerPersistentStoreUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/PersistentStoreMaxUnreplicatedIntervalTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/PersistentStoreMemoryLeakTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/PersistentStoreSessionCountUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/PersistentStoreSessionNotificationPolicyTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/PersistentManagerCrossContextCallsTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/testutil/DBSetupDelegate.java
trunk/testsuite/src/main/org/jboss/test/cluster/testutil/DelegatingClusteredTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/testutil/TestSetupDelegate.java
trunk/testsuite/src/main/org/jboss/test/cluster/web/JBossCacheConfigTestSetupDelegate.java
trunk/testsuite/src/main/org/jboss/test/cluster/web/persistent/
trunk/testsuite/src/resources/cluster/persistent/
trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/AskSessionOutdatedSessionChecker.java
trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/OutdatedSessionChecker.java
trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/OwnedSessionUpdate.java
trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/
Modified:
trunk/testsuite/imports/sections/cluster.xml
trunk/testsuite/src/main/org/jboss/test/cluster/testutil/DBSetup.java
trunk/testsuite/src/main/org/jboss/test/cluster/web/JBossClusteredWebTestCase.java
trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/DeployerConfig.java
trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java
trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java
trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossManager.java
trunk/tools/etc/buildmagic/modules.ent
Log:
[JBAS-7095] HA Web Sessions via Database Persistence
Modified: trunk/testsuite/imports/sections/cluster.xml
===================================================================
--- trunk/testsuite/imports/sections/cluster.xml 2009-07-14 14:54:17 UTC (rev 91218)
+++ trunk/testsuite/imports/sections/cluster.xml 2009-07-14 15:00:09 UTC (rev 91219)
@@ -602,8 +602,17 @@
<fileset dir="${build.lib}">
<include name="cluster-clleak-ejb.jar"/>
</fileset>
- </ear>
+ </ear>
+ <jar destfile="${build.lib}/rdbmsstore-tablesetup.jar">
+ <metainf dir="${build.resources}/cluster/persistent">
+ <include name="rdbmsstore-tablesetup-jboss-beans.xml"/>
+ </metainf>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/cluster/web/persistent/PersistentStoreTableSetup.class"/>
+ </fileset>
+ </jar>
+
</target>
<!-- testbeancluster test -->
@@ -720,7 +729,81 @@
fullpath="META-INF/ejb-jar.xml" includes="pooledha-ejb-jar.xml"/>
<zipfileset dir="${build.resources}/cluster/ejb2/basic"
fullpath="META-INF/jboss.xml" includes="pooledha-jboss.xml"/>
- </jar>
+ </jar>
+
+ <!-- DataSourcePersistentManager Tests -->
+ <copy todir="${build.lib}"
+ file="${build.resources}/cluster/persistent/httpsession-ds.xml"
+ overwrite="true"/>
+
+ <jar destfile="${build.lib}/disable-manager-override.beans">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/cluster/web/persistent/ManagerOverrideDisabler.class"/>
+ </fileset>
+ <metainf dir="${build.resources}/cluster/persistent/">
+ <include name="disable-manager-override-jboss-beans.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- build http-cross-ctx-first-persistent.jar -->
+ <war warfile="${build.lib}/http-cross-ctx-first-persistent.war"
+ webxml="${build.resources}/cluster/http/http-cross-ctx-first/WEB-INF/web.xml">
+ <webinf dir="${build.resources}/cluster/persistent/WEB-INF">
+ <include name="context.xml"/>
+ </webinf>
+ <classes dir="${build.classes}">
+ <include name="org/jboss/test/cluster/web/Person.class"/>
+ <include name="org/jboss/test/cluster/web/CacheHelper*"/>
+ <include name="org/jboss/test/cluster/web/BindingListener.class"/>
+ <include name="org/jboss/test/cluster/web/DeserializationSensor.class"/>
+ </classes>
+ <fileset dir="${build.resources}/cluster/http/http-cross-ctx-first">
+ <include name="*.jsp"/>
+ </fileset>
+ </war>
+
+ <!-- build http-cross-ctx-second-persistent.jar -->
+ <war warfile="${build.lib}/http-cross-ctx-second-persistent.war"
+ webxml="${build.resources}/cluster/http/http-cross-ctx-second/WEB-INF/web.xml">
+ <webinf dir="${build.resources}/cluster/persistent/WEB-INF">
+ <include name="context.xml"/>
+ </webinf>
+ <classes dir="${build.classes}">
+ <include name="org/jboss/test/cluster/web/Person.class"/>
+ <include name="org/jboss/test/cluster/web/CacheHelper*"/>
+ <include name="org/jboss/test/cluster/web/BindingListener.class"/>
+ <include name="org/jboss/test/cluster/web/DeserializationSensor.class"/>
+ </classes>
+ <fileset dir="${build.resources}/cluster/http/http-cross-ctx-second">
+ <include name="*.jsp"/>
+ </fileset>
+ </war>
+
+ <!-- build http-cross-ctx-third-persistent.jar -->
+ <war warfile="${build.lib}/http-cross-ctx-third-persistent.war"
+ webxml="${build.resources}/cluster/http/http-cross-ctx-third/WEB-INF/web.xml">
+ <webinf dir="${build.resources}/cluster/persistent/WEB-INF">
+ <include name="context.xml"/>
+ </webinf>
+ <classes dir="${build.classes}">
+ <include name="org/jboss/test/cluster/web/Person.class"/>
+ <include name="org/jboss/test/cluster/web/CacheHelper*"/>
+ <include name="org/jboss/test/cluster/web/BindingListener.class"/>
+ <include name="org/jboss/test/cluster/web/DeserializationSensor.class"/>
+ </classes>
+ <fileset dir="${build.resources}/cluster/http/http-cross-ctx-third">
+ <include name="*.jsp"/>
+ </fileset>
+ </war>
+
+ <ear earfile="${build.lib}/http-cross-ctx-persistent.ear"
+ appxml="${build.resources}/cluster/persistent/META-INF/application.xml">
+ <fileset dir="${build.lib}">
+ <include name="http-cross-ctx-first-persistent.war"/>
+ <include name="http-cross-ctx-second-persistent.war"/>
+ <include name="http-cross-ctx-third-persistent.war"/>
+ </fileset>
+ </ear>
</target>
@@ -828,7 +911,7 @@
<fileset dir="${build.classes}">
<include name="org/jboss/test/cluster/rspfilter/*"/>
</fileset>
- </zip>
+ </zip>
</target>
</project>
Copied: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/DriverManagerPersistentStoreUnitTestCase.java (from rev 91184, branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/DriverManagerPersistentStoreUnitTestCase.java)
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/DriverManagerPersistentStoreUnitTestCase.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/DriverManagerPersistentStoreUnitTestCase.java 2009-07-14 15:00:09 UTC (rev 91219)
@@ -0,0 +1,758 @@
+/**
+ *
+ */
+package org.jboss.test.cluster.defaultcfg.simpleweb.test;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+
+import org.jboss.test.cluster.web.persistent.MockOutgoingSessionData;
+import org.jboss.test.cluster.web.persistent.SimplePersistentStoreTestSetup;
+import org.jboss.web.tomcat.service.session.distributedcache.spi.DistributableSessionMetadata;
+import org.jboss.web.tomcat.service.session.distributedcache.spi.IncomingDistributableSessionData;
+import org.jboss.web.tomcat.service.session.distributedcache.spi.OutgoingSessionGranularitySessionData;
+import org.jboss.web.tomcat.service.session.persistent.DriverManagerPersistentStore;
+import org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase;
+
+/**
+ * Unit tests for {@link DriverManagerPersistentStore}, although really more of
+ * a test of its abstract superclass RDBMSStoreBase where we use the
+ * DriverManager-based subclass as a simple way to get a concrete implementation.
+ *
+ * @author Brian Stansberry
+ *
+ * @version $Revision: $
+ */
+public class DriverManagerPersistentStoreUnitTestCase extends TestCase
+{
+ private static final String CONNECTION_URL = "jdbc:hsqldb:hsql://localhost:1701";
+ private static final String CONTEXT_PATH = "localhost/test";
+
+ private static AtomicInteger id = new AtomicInteger();
+
+ private DriverManagerPersistentStore testee;
+
+ /**
+ * @param name
+ */
+ public DriverManagerPersistentStoreUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite() throws Exception
+ {
+ return SimplePersistentStoreTestSetup.getDeploySetup(DriverManagerPersistentStoreUnitTestCase.class);
+ }
+
+ private static String nextId()
+ {
+ return "session" + id.incrementAndGet();
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ testee = new DriverManagerPersistentStore();
+ testee.setDriverName(org.hsqldb.jdbcDriver.class.getName());
+ testee.setConnectionURL(CONNECTION_URL);
+ testee.setConnectionName("sa");
+ testee.setName(CONTEXT_PATH);
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ try
+ {
+ if (testee != null && testee.isStarted())
+ {
+ testee.stop();
+ }
+ }
+ finally
+ {
+ super.tearDown();
+ }
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.DriverManagerPersistentStore#getInfo()}.
+ */
+ public void testGetInfo()
+ {
+ testee.start();
+ assertEquals(testee.getStoreName() + "/1.0", testee.getInfo());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.DriverManagerPersistentStore#getStoreName()}.
+ */
+ public void testGetStoreName()
+ {
+ assertEquals(testee.getClass().getSimpleName(), testee.getStoreName());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.DriverManagerPersistentStore#setConnectionURL(java.lang.String)}.
+ */
+ public void testConnectionURL()
+ {
+ assertEquals(CONNECTION_URL, testee.getConnectionURL());
+ testee.setConnectionURL("blah");
+ assertEquals("blah", testee.getConnectionURL());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.DriverManagerPersistentStore#setDriverName(java.lang.String)}.
+ */
+ public void testDriverName()
+ {
+ assertEquals(org.hsqldb.jdbcDriver.class.getName(), testee.getDriverName());
+ testee.setDriverName("blah");
+ assertEquals("blah", testee.getDriverName());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase#getName()}.
+ */
+ public void testName()
+ {
+ assertEquals(CONTEXT_PATH, testee.getName());
+ testee.setName("blah");
+ assertEquals("blah", testee.getName());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase#setConnectionName(java.lang.String)}.
+ */
+ public void testConnectionName()
+ {
+ assertEquals("sa", testee.getConnectionName());
+ testee.setConnectionName("blah");
+ assertEquals("blah", testee.getConnectionName());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase#setConnectionPassword(java.lang.String)}.
+ */
+ public void testConnectionPassword()
+ {
+ assertNull(testee.getConnectionPassword());
+ testee.setConnectionPassword("blah");
+ assertEquals("blah", testee.getConnectionPassword());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase#setSessionTable(java.lang.String)}.
+ */
+ public void testSessionTable()
+ {
+ assertEquals(RDBMSStoreBase.DEFAULT_TABLE, testee.getSessionTable());
+ testee.setSessionTable("blah");
+ assertEquals("blah", testee.getSessionTable());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase#setSessionAppCol(java.lang.String)}.
+ */
+ public void testSessionAppCol()
+ {
+ assertEquals(RDBMSStoreBase.DEFAULT_APP_COL, testee.getSessionAppCol());
+ testee.setSessionAppCol("blah");
+ assertEquals("blah", testee.getSessionAppCol());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase#setSessionIdCol(java.lang.String)}.
+ */
+ public void testSessionIdCol()
+ {
+ assertEquals(RDBMSStoreBase.DEFAULT_ID_COL, testee.getSessionIdCol());
+ testee.setSessionIdCol("blah");
+ assertEquals("blah", testee.getSessionIdCol());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase#setSessionFullIdCol(java.lang.String)}.
+ */
+ public void testSessionFullIdCol()
+ {
+ assertEquals(RDBMSStoreBase.DEFAULT_FULLID_COL, testee.getSessionFullIdCol());
+ testee.setSessionFullIdCol("blah");
+ assertEquals("blah", testee.getSessionFullIdCol());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase#setSessionCreationTimeCol(java.lang.String)}.
+ */
+ public void testSessionCreationTimeCol()
+ {
+ assertEquals(RDBMSStoreBase.DEFAULT_CREATION_TIME_COL, testee.getSessionCreationTimeCol());
+ testee.setSessionCreationTimeCol("blah");
+ assertEquals("blah", testee.getSessionCreationTimeCol());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase#setSessionMaxInactiveCol(java.lang.String)}.
+ */
+ public void testSessionMaxInactiveCol()
+ {
+ assertEquals(RDBMSStoreBase.DEFAULT_MAX_INACTIVE_COL, testee.getSessionMaxInactiveCol());
+ testee.setSessionMaxInactiveCol("blah");
+ assertEquals("blah", testee.getSessionMaxInactiveCol());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase#setSessionNewCol(java.lang.String)}.
+ */
+ public void testSessionNewCol()
+ {
+ assertEquals(RDBMSStoreBase.DEFAULT_ISNEW_COL, testee.getSessionNewCol());
+ testee.setSessionNewCol("blah");
+ assertEquals("blah", testee.getSessionNewCol());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase#setSessionVersionCol(java.lang.String)}.
+ */
+ public void testSessionVersionCol()
+ {
+ assertEquals(RDBMSStoreBase.DEFAULT_VERSION_COL, testee.getSessionVersionCol());
+ testee.setSessionVersionCol("blah");
+ assertEquals("blah", testee.getSessionVersionCol());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase#setSessionLastAccessedCol(java.lang.String)}.
+ */
+ public void testSessionLastAccessedCol()
+ {
+ assertEquals(RDBMSStoreBase.DEFAULT_LAST_ACCESSED_COL, testee.getSessionLastAccessedCol());
+ testee.setSessionLastAccessedCol("blah");
+ assertEquals("blah", testee.getSessionLastAccessedCol());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase#setSessionValidCol(java.lang.String)}.
+ */
+ public void testSessionValidCol()
+ {
+ assertEquals(RDBMSStoreBase.DEFAULT_ISVALID_COL, testee.getSessionValidCol());
+ testee.setSessionValidCol("blah");
+ assertEquals("blah", testee.getSessionValidCol());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase#setSessionMetadataCol(java.lang.String)}.
+ */
+ public void testSessionMetadataCol()
+ {
+ assertEquals(RDBMSStoreBase.DEFAULT_METADATA_COL, testee.getSessionMetadataCol());
+ testee.setSessionMetadataCol("blah");
+ assertEquals("blah", testee.getSessionMetadataCol());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase#setCleanupInterval(int)}.
+ */
+ public void testSetCleanupInterval()
+ {
+ assertEquals(RDBMSStoreBase.DEFAULT_CLEANUP_INTERVAL, testee.getCleanupInterval());
+ testee.setCleanupInterval(22);
+ assertEquals(22, testee.getCleanupInterval());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase#clear()}.
+ */
+ public void testClear()
+ {
+ testee.start();
+
+ int existing = testee.getSize();
+
+ DistributableSessionMetadata md = new DistributableSessionMetadata();
+ String id = nextId();
+ md.setId(id + ".full");
+ md.setCreationTime(System.currentTimeMillis());
+ md.setNew(true);
+ md.setValid(true);
+ md.setMaxInactiveInterval(30000);
+ Long ts = Long.valueOf(md.getCreationTime() + 1);
+ Map<String, Object> attrs = new HashMap<String, Object>();
+ attrs.put("key", "value");
+ OutgoingSessionGranularitySessionData sessionData = new MockOutgoingSessionData(id, 0, ts, md, attrs);
+ testee.storeSessionData(sessionData);
+
+ assertEquals(Integer.valueOf(0), testee.getSessionVersion(id));
+
+ md = new DistributableSessionMetadata();
+ String id2 = nextId();
+ md.setId(id2 + ".full");
+ md.setCreationTime(System.currentTimeMillis());
+ md.setNew(true);
+ md.setValid(true);
+ md.setMaxInactiveInterval(30000);
+ ts = Long.valueOf(md.getCreationTime() + 1);
+ attrs = new HashMap<String, Object>();
+ attrs.put("key", "value");
+ sessionData = new MockOutgoingSessionData(id2, 0, ts, md, attrs);
+ testee.storeSessionData(sessionData);
+
+ assertEquals(Integer.valueOf(0), testee.getSessionVersion(id2));
+
+ assertEquals(2 + existing, testee.getSize());
+
+ testee.clear();
+
+ assertNull(testee.getSessionVersion(id));
+ assertNull(testee.getSessionVersion(id2));
+
+ assertEquals(0, testee.getSize());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase#getSessionIds()}.
+ */
+ public void testGetSessionIds()
+ {
+ testee.start();
+ DistributableSessionMetadata md = new DistributableSessionMetadata();
+ String id = nextId();
+ md.setId(id + ".full");
+ md.setCreationTime(System.currentTimeMillis());
+ md.setNew(true);
+ md.setValid(true);
+ md.setMaxInactiveInterval(30000);
+ Long ts = Long.valueOf(md.getCreationTime() + 1);
+ Map<String, Object> attrs = new HashMap<String, Object>();
+ attrs.put("key", "value");
+ OutgoingSessionGranularitySessionData sessionData = new MockOutgoingSessionData(id, 0, ts, md, attrs);
+ testee.storeSessionData(sessionData);
+
+ md = new DistributableSessionMetadata();
+ String id2 = nextId();
+ md.setId(id2 + ".full");
+ md.setCreationTime(System.currentTimeMillis());
+ md.setNew(true);
+ md.setValid(true);
+ md.setMaxInactiveInterval(30000);
+ ts = Long.valueOf(md.getCreationTime() + 1);
+ attrs = new HashMap<String, Object>();
+ attrs.put("key", "value");
+ sessionData = new MockOutgoingSessionData(id2, 0, ts, md, attrs);
+ testee.storeSessionData(sessionData);
+
+ Set<String> ids = testee.getSessionIds();
+ assertNotNull(ids);
+ assertTrue(ids.contains(id));
+ assertTrue(ids.contains(id2));
+ assertEquals(2, ids.size());
+
+ testee.remove(id);
+
+ ids = testee.getSessionIds();
+ assertNotNull(ids);
+ assertFalse(ids.contains(id));
+ assertTrue(ids.contains(id2));
+ assertEquals(1, ids.size());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase#getSessionData(java.lang.String, boolean)}.
+ */
+ public void testGetSessionData()
+ {
+ testee.start();
+ DistributableSessionMetadata md = new DistributableSessionMetadata();
+ String id = nextId();
+ md.setId(id + ".full");
+ md.setCreationTime(System.currentTimeMillis());
+ md.setNew(true);
+ md.setValid(true);
+ md.setMaxInactiveInterval(30000);
+ Long ts = Long.valueOf(md.getCreationTime() + 1);
+ Map<String, Object> attrs = new HashMap<String, Object>();
+ attrs.put("key", "value");
+ OutgoingSessionGranularitySessionData sessionData = new MockOutgoingSessionData(id, 0, ts, md, attrs);
+ testee.storeSessionData(sessionData);
+
+ IncomingDistributableSessionData incoming = testee.getSessionData(id, true);
+ assertEquals(0, incoming.getVersion());
+ assertEquals(md.getCreationTime() + 1, incoming.getTimestamp());
+ assertEquals(md.getId(), incoming.getMetadata().getId());
+ assertEquals(md.getCreationTime(), incoming.getMetadata().getCreationTime());
+ assertEquals(md.isNew(), incoming.getMetadata().isNew());
+ assertEquals(md.isValid(), incoming.getMetadata().isValid());
+ assertEquals(md.getMaxInactiveInterval(), incoming.getMetadata().getMaxInactiveInterval());
+ assertTrue(incoming.providesSessionAttributes());
+ assertEquals(attrs, incoming.getSessionAttributes());
+
+ incoming = testee.getSessionData(id, false);
+ assertEquals(0, incoming.getVersion());
+ assertEquals(md.getCreationTime() + 1, incoming.getTimestamp());
+ assertEquals(md.getId(), incoming.getMetadata().getId());
+ assertEquals(md.getCreationTime(), incoming.getMetadata().getCreationTime());
+ assertEquals(md.isNew(), incoming.getMetadata().isNew());
+ assertEquals(md.isValid(), incoming.getMetadata().isValid());
+ assertEquals(md.getMaxInactiveInterval(), incoming.getMetadata().getMaxInactiveInterval());
+ assertFalse(incoming.providesSessionAttributes());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase#remove(java.lang.String)}.
+ */
+ public void testRemove()
+ {
+ testee.start();
+
+ int existing = testee.getSize();
+
+ DistributableSessionMetadata md = new DistributableSessionMetadata();
+ String id = nextId();
+ md.setId(id + ".full");
+ md.setCreationTime(System.currentTimeMillis());
+ md.setNew(true);
+ md.setValid(true);
+ md.setMaxInactiveInterval(30000);
+ Long ts = Long.valueOf(md.getCreationTime() + 1);
+ Map<String, Object> attrs = new HashMap<String, Object>();
+ attrs.put("key", "value");
+ OutgoingSessionGranularitySessionData sessionData = new MockOutgoingSessionData(id, 0, ts, md, attrs);
+ testee.storeSessionData(sessionData);
+
+ testee.remove(id);
+
+ assertNull(testee.getSessionData(id, false));
+ assertNull(testee.getSessionData(id, true));
+ assertNull(testee.getSessionVersion(id));
+ assertNull(testee.getSessionTimestamp(id));
+
+ Set<String> ids = testee.getSessionIds();
+ assertNotNull(ids);
+ assertFalse(ids.contains(id));
+ assertEquals(existing, ids.size());
+
+ assertEquals(existing, testee.getSize());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase#storeSessionData(org.jboss.web.tomcat.service.session.distributedcache.spi.OutgoingSessionGranularitySessionData)}.
+ */
+ public void testInsertSessionData()
+ {
+ testee.start();
+ DistributableSessionMetadata md = new DistributableSessionMetadata();
+ String id = nextId();
+ md.setId(id + ".full");
+ md.setCreationTime(System.currentTimeMillis());
+ md.setNew(true);
+ md.setValid(true);
+ md.setMaxInactiveInterval(30000);
+ Long ts = Long.valueOf(md.getCreationTime() + 1);
+ Map<String, Object> attrs = new HashMap<String, Object>();
+ attrs.put("key", "value");
+ OutgoingSessionGranularitySessionData sessionData = new MockOutgoingSessionData(id, 0, ts, md, attrs);
+ testee.storeSessionData(sessionData);
+
+ IncomingDistributableSessionData incoming = testee.getSessionData(id, true);
+ assertEquals(0, incoming.getVersion());
+ assertEquals(md.getCreationTime() + 1, incoming.getTimestamp());
+ assertEquals(md.getId(), incoming.getMetadata().getId());
+ assertEquals(md.getCreationTime(), incoming.getMetadata().getCreationTime());
+ assertEquals(md.isNew(), incoming.getMetadata().isNew());
+ assertEquals(md.isValid(), incoming.getMetadata().isValid());
+ assertEquals(md.getMaxInactiveInterval(), incoming.getMetadata().getMaxInactiveInterval());
+ assertTrue(incoming.providesSessionAttributes());
+ assertEquals(attrs, incoming.getSessionAttributes());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase#storeSessionData(org.jboss.web.tomcat.service.session.distributedcache.spi.OutgoingSessionGranularitySessionData)}.
+ */
+ public void testInsertSessionDataNullAttributes()
+ {
+ testee.start();
+ DistributableSessionMetadata md = new DistributableSessionMetadata();
+ String id = nextId();
+ md.setId(id + ".full");
+ md.setCreationTime(System.currentTimeMillis());
+ md.setNew(true);
+ md.setValid(true);
+ md.setMaxInactiveInterval(30000);
+ Long ts = Long.valueOf(md.getCreationTime() + 1);
+ Map<String, Object> attrs = null;
+ OutgoingSessionGranularitySessionData sessionData = new MockOutgoingSessionData(id, 0, ts, md, attrs);
+ testee.storeSessionData(sessionData);
+
+ IncomingDistributableSessionData incoming = testee.getSessionData(id, true);
+ assertEquals(0, incoming.getVersion());
+ assertEquals(md.getCreationTime() + 1, incoming.getTimestamp());
+ assertEquals(md.getId(), incoming.getMetadata().getId());
+ assertEquals(md.getCreationTime(), incoming.getMetadata().getCreationTime());
+ assertEquals(md.isNew(), incoming.getMetadata().isNew());
+ assertEquals(md.isValid(), incoming.getMetadata().isValid());
+ assertEquals(md.getMaxInactiveInterval(), incoming.getMetadata().getMaxInactiveInterval());
+ Map<String, Object> map = incoming.getSessionAttributes();
+ assertNotNull(map);
+ assertEquals(0, map.size());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase#storeSessionData(org.jboss.web.tomcat.service.session.distributedcache.spi.OutgoingSessionGranularitySessionData)}.
+ */
+ public void testFullUpdateSessionData()
+ {
+ testee.start();
+ DistributableSessionMetadata md = new DistributableSessionMetadata();
+ String id = nextId();
+ md.setId(id + ".full");
+ md.setCreationTime(System.currentTimeMillis());
+ md.setNew(true);
+ md.setValid(true);
+ md.setMaxInactiveInterval(30000);
+ Long ts = Long.valueOf(md.getCreationTime() + 1);
+ Map<String, Object> attrs = new HashMap<String, Object>();
+ attrs.put("key", "value");
+ OutgoingSessionGranularitySessionData sessionData = new MockOutgoingSessionData(id, 1, ts, md, attrs);
+ testee.storeSessionData(sessionData);
+
+ md.setNew(false);
+ md.setMaxInactiveInterval(20000);
+ attrs.put("key", "newvalue");
+ ts = Long.valueOf(System.currentTimeMillis());
+ sessionData = new MockOutgoingSessionData(id, 1, ts, md, attrs);
+ testee.storeSessionData(sessionData);
+
+ IncomingDistributableSessionData incoming = testee.getSessionData(id, true);
+ assertEquals(1, incoming.getVersion());
+ assertEquals(ts.longValue(), incoming.getTimestamp());
+ assertEquals(md.getId(), incoming.getMetadata().getId());
+ assertEquals(md.getCreationTime(), incoming.getMetadata().getCreationTime());
+ assertEquals(md.isNew(), incoming.getMetadata().isNew());
+ assertEquals(md.isValid(), incoming.getMetadata().isValid());
+ assertEquals(md.getMaxInactiveInterval(), incoming.getMetadata().getMaxInactiveInterval());
+ assertTrue(incoming.providesSessionAttributes());
+ assertEquals(attrs, incoming.getSessionAttributes());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase#storeSessionData(org.jboss.web.tomcat.service.session.distributedcache.spi.OutgoingSessionGranularitySessionData)}.
+ */
+ public void testAttributeUpdateSessionData()
+ {
+ testee.start();
+ DistributableSessionMetadata md = new DistributableSessionMetadata();
+ String id = nextId();
+ md.setId(id + ".full");
+ md.setCreationTime(System.currentTimeMillis());
+ md.setNew(true);
+ md.setValid(true);
+ md.setMaxInactiveInterval(30000);
+ Long ts = Long.valueOf(md.getCreationTime() + 1);
+ Map<String, Object> attrs = new HashMap<String, Object>();
+ attrs.put("key", "value");
+ OutgoingSessionGranularitySessionData sessionData = new MockOutgoingSessionData(id, 1, ts, md, attrs);
+ testee.storeSessionData(sessionData);
+
+ attrs.put("key", "newvalue");
+ ts = Long.valueOf(System.currentTimeMillis());
+ sessionData = new MockOutgoingSessionData(id, 1, ts, null, attrs);
+ testee.storeSessionData(sessionData);
+
+ IncomingDistributableSessionData incoming = testee.getSessionData(id, true);
+ assertEquals(1, incoming.getVersion());
+ assertEquals(ts.longValue(), incoming.getTimestamp());
+ assertEquals(md.getId(), incoming.getMetadata().getId());
+ assertEquals(md.getCreationTime(), incoming.getMetadata().getCreationTime());
+ assertEquals(md.isNew(), incoming.getMetadata().isNew());
+ assertEquals(md.isValid(), incoming.getMetadata().isValid());
+ assertEquals(md.getMaxInactiveInterval(), incoming.getMetadata().getMaxInactiveInterval());
+ assertTrue(incoming.providesSessionAttributes());
+ assertEquals(attrs, incoming.getSessionAttributes());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase#storeSessionData(org.jboss.web.tomcat.service.session.distributedcache.spi.OutgoingSessionGranularitySessionData)}.
+ */
+ public void testMetadataUpdateSessionData()
+ {
+ testee.start();
+ DistributableSessionMetadata md = new DistributableSessionMetadata();
+ String id = nextId();
+ md.setId(id + ".full");
+ md.setCreationTime(System.currentTimeMillis());
+ md.setNew(true);
+ md.setValid(true);
+ md.setMaxInactiveInterval(30000);
+ Long ts = Long.valueOf(md.getCreationTime() + 1);
+ Map<String, Object> attrs = new HashMap<String, Object>();
+ attrs.put("key", "value");
+ OutgoingSessionGranularitySessionData sessionData = new MockOutgoingSessionData(id, 1, ts, md, attrs);
+ testee.storeSessionData(sessionData);
+
+ md.setNew(false);
+ md.setMaxInactiveInterval(20000);
+ ts = Long.valueOf(System.currentTimeMillis());
+ sessionData = new MockOutgoingSessionData(id, 1, ts, md, null);
+ testee.storeSessionData(sessionData);
+
+ IncomingDistributableSessionData incoming = testee.getSessionData(id, true);
+ assertEquals(1, incoming.getVersion());
+ assertEquals(ts.longValue(), incoming.getTimestamp());
+ assertEquals(md.getId(), incoming.getMetadata().getId());
+ assertEquals(md.getCreationTime(), incoming.getMetadata().getCreationTime());
+ assertEquals(md.isNew(), incoming.getMetadata().isNew());
+ assertEquals(md.isValid(), incoming.getMetadata().isValid());
+ assertEquals(md.getMaxInactiveInterval(), incoming.getMetadata().getMaxInactiveInterval());
+ assertTrue(incoming.providesSessionAttributes());
+ assertEquals(attrs, incoming.getSessionAttributes());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase#storeSessionData(org.jboss.web.tomcat.service.session.distributedcache.spi.OutgoingSessionGranularitySessionData)}.
+ */
+ public void testSimpleUpdateSessionData()
+ {
+ testee.start();
+ DistributableSessionMetadata md = new DistributableSessionMetadata();
+ String id = nextId();
+ md.setId(id + ".full");
+ md.setCreationTime(System.currentTimeMillis());
+ md.setNew(true);
+ md.setValid(true);
+ md.setMaxInactiveInterval(30000);
+ Long ts = Long.valueOf(md.getCreationTime() + 1);
+ Map<String, Object> attrs = new HashMap<String, Object>();
+ attrs.put("key", "value");
+ OutgoingSessionGranularitySessionData sessionData = new MockOutgoingSessionData(id, 1, ts, md, attrs);
+ testee.storeSessionData(sessionData);
+
+ ts = Long.valueOf(System.currentTimeMillis());
+ sessionData = new MockOutgoingSessionData(id, 1, ts, null, null);
+ testee.storeSessionData(sessionData);
+
+ IncomingDistributableSessionData incoming = testee.getSessionData(id, true);
+ assertEquals(1, incoming.getVersion());
+ assertEquals(ts.longValue(), incoming.getTimestamp());
+ assertEquals(md.getId(), incoming.getMetadata().getId());
+ assertEquals(md.getCreationTime(), incoming.getMetadata().getCreationTime());
+ assertEquals(md.isNew(), incoming.getMetadata().isNew());
+ assertEquals(md.isValid(), incoming.getMetadata().isValid());
+ assertEquals(md.getMaxInactiveInterval(), incoming.getMetadata().getMaxInactiveInterval());
+ assertTrue(incoming.providesSessionAttributes());
+ assertEquals(attrs, incoming.getSessionAttributes());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase#getSessionTimestamp(java.lang.String)}.
+ */
+ public void testGetSessionTimestamp()
+ {
+ testee.start();
+ String id = nextId();
+
+ assertNull(testee.getSessionTimestamp(id));
+
+ DistributableSessionMetadata md = new DistributableSessionMetadata();
+ md.setId(id + ".full");
+ md.setCreationTime(System.currentTimeMillis());
+ md.setNew(true);
+ md.setValid(true);
+ md.setMaxInactiveInterval(30000);
+ Long ts = Long.valueOf(md.getCreationTime() + 1);
+ Map<String, Object> attrs = new HashMap<String, Object>();
+ attrs.put("key", "value");
+ OutgoingSessionGranularitySessionData sessionData = new MockOutgoingSessionData(id, 1, ts, md, attrs);
+ testee.storeSessionData(sessionData);
+
+ IncomingDistributableSessionData incoming = testee.getSessionData(id, true);
+ assertEquals(1, incoming.getVersion());
+ assertEquals(ts.longValue(), incoming.getTimestamp());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase#getSessionVersion(java.lang.String)}.
+ */
+ public void testGetSessionVersion()
+ {
+ testee.start();
+ String id = nextId();
+
+ assertNull(testee.getSessionVersion(id));
+
+ DistributableSessionMetadata md = new DistributableSessionMetadata();
+ md.setId(id + ".full");
+ md.setCreationTime(System.currentTimeMillis());
+ md.setNew(true);
+ md.setValid(true);
+ md.setMaxInactiveInterval(30000);
+ Long ts = Long.valueOf(md.getCreationTime() + 1);
+ Map<String, Object> attrs = new HashMap<String, Object>();
+ attrs.put("key", "value");
+ OutgoingSessionGranularitySessionData sessionData = new MockOutgoingSessionData(id, 1, ts, md, attrs);
+ testee.storeSessionData(sessionData);
+
+ IncomingDistributableSessionData incoming = testee.getSessionData(id, true);
+ assertEquals(1, incoming.getVersion());
+ }
+
+ /**
+ * Test method for {@link org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase#processExpires()}.
+ */
+ public void testProcessExpires()
+ {
+ testee.setCleanupInterval(2);
+ testee.start();
+
+ int existing = testee.getSize();
+
+ DistributableSessionMetadata md = new DistributableSessionMetadata();
+ String id = nextId();
+ md.setId(id + ".full");
+ md.setCreationTime(System.currentTimeMillis());
+ md.setNew(true);
+ md.setValid(true);
+ md.setMaxInactiveInterval(1);
+ Long ts = Long.valueOf(md.getCreationTime() + 1);
+ Map<String, Object> attrs = new HashMap<String, Object>();
+ attrs.put("key", "value");
+ OutgoingSessionGranularitySessionData sessionData = new MockOutgoingSessionData(id, 0, ts, md, attrs);
+ testee.storeSessionData(sessionData);
+
+ sleep(500);
+
+ testee.processExpires();
+
+ assertEquals(Integer.valueOf(0), testee.getSessionVersion(id));
+
+ sleep(2001);
+
+ testee.processExpires();
+
+ assertNull(testee.getSessionVersion(id));
+
+ assertEquals(existing, testee.getSize());
+ }
+
+ private void sleep(int sleeptime)
+ {
+ try
+ {
+ Thread.sleep(sleeptime);
+ }
+ catch (InterruptedException ignored)
+ {
+ ;
+ }
+ }
+
+}
Copied: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/PersistentStoreMaxUnreplicatedIntervalTestCase.java (from rev 91184, branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/PersistentStoreMaxUnreplicatedIntervalTestCase.java)
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/PersistentStoreMaxUnreplicatedIntervalTestCase.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/PersistentStoreMaxUnreplicatedIntervalTestCase.java 2009-07-14 15:00:09 UTC (rev 91219)
@@ -0,0 +1,340 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.cluster.defaultcfg.simpleweb.test;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import junit.framework.Test;
+
+import org.jboss.logging.Logger;
+import org.jboss.metadata.web.jboss.ReplicationGranularity;
+import org.jboss.metadata.web.jboss.ReplicationTrigger;
+import org.jboss.test.JBossTestCase;
+import org.jboss.test.cluster.testutil.SessionTestUtil;
+import org.jboss.test.cluster.web.CacheHelper;
+import org.jboss.test.cluster.web.mocks.BasicRequestHandler;
+import org.jboss.test.cluster.web.mocks.MutableObject;
+import org.jboss.test.cluster.web.mocks.SetAttributesRequestHandler;
+import org.jboss.test.cluster.web.persistent.PersistentSessionTestUtil;
+import org.jboss.test.cluster.web.persistent.SimplePersistentStoreTestSetup;
+import org.jboss.web.tomcat.service.session.persistent.DataSourcePersistentManager;
+
+/**
+ * Tests of handling of ClusteredSession.maxUnreplicatedInterval. This base
+ * test is run with SESSION granularity.
+ *
+ * @author Brian Stansberry
+ */
+public class PersistentStoreMaxUnreplicatedIntervalTestCase extends JBossTestCase
+{
+ protected static long testId = System.currentTimeMillis();
+
+ protected Logger log = Logger.getLogger(getClass());
+
+ protected Set<DataSourcePersistentManager> managers = new HashSet<DataSourcePersistentManager>();
+
+ protected Map<String, Object> allAttributes;
+ protected Map<String, Object> immutables;
+ protected Map<String, Object> mutables;
+
+ public PersistentStoreMaxUnreplicatedIntervalTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite() throws Exception
+ {
+ return SimplePersistentStoreTestSetup.getDeploySetup(PersistentStoreMaxUnreplicatedIntervalTestCase.class);
+ }
+
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ allAttributes = new HashMap<String, Object>();
+ immutables = new HashMap<String, Object>();
+ mutables = new HashMap<String, Object>();
+
+ allAttributes.put("IMMUTABLE", "IMMUTABLE");
+ immutables.put("IMMUTABLE", "IMMUTABLE");
+
+ MutableObject mo = new MutableObject("MUTABLE");
+ allAttributes.put("MUTABLE", mo);
+ mutables.put("MUTABLE", mo);
+
+ allAttributes = Collections.unmodifiableMap(allAttributes);
+ immutables = Collections.unmodifiableMap(immutables);
+ mutables = Collections.unmodifiableMap(mutables);
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+
+ for (DataSourcePersistentManager manager : managers)
+ manager.stop();
+
+ managers.clear();
+ }
+
+ protected ReplicationGranularity getReplicationGranularity()
+ {
+ return ReplicationGranularity.SESSION;
+ }
+
+ protected ReplicationTrigger getReplicationTrigger()
+ {
+ return ReplicationTrigger.SET_AND_NON_PRIMITIVE_GET;
+ }
+
+ /**
+ * Tests that a maxUnreplicatedInterval of 1 second prevents inadvertent
+ * session expiration. Test makes a read-only request after the
+ * maxUnreplicatedInterval has passed, waits long enough for the session
+ * to expire on the remote node if the read-only request didn't trigger a
+ * timestamp replication, and then accesses the session on the 2nd node to
+ * confirm that the session is still alive.
+ *
+ * @throws Exception
+ */
+ public void testBasicMaxIntervalPreventsExpiration() throws Exception
+ {
+ log.info("++++ Starting testBasicMaxIntervalPreventsExpiration ++++");
+
+ maxIntervalPreventsExpirationTest(false);
+ }
+
+ /**
+ * Tests that the override maxUnreplicatedInterval of 0 prevents inadvertent
+ * session expiration. Test makes a read-only request after one second
+ * has passed, waits long enough for the session
+ * to expire on the remote node if the read-only request didn't trigger a
+ * timestamp replication, and then accesses the session on the 2nd node to
+ * confirm that the session is still alive.
+ *
+ * @throws Exception
+ */
+ public void testZeroMaxIntervalPreventsExpiration() throws Exception
+ {
+ log.info("++++ Starting testZeroMaxIntervalPreventsExpiration ++++");
+
+ maxIntervalPreventsExpirationTest(true);
+ }
+
+ private void maxIntervalPreventsExpirationTest(boolean testZero) throws Exception
+ {
+ String warname = String.valueOf(++testId);
+
+ int maxUnrep = testZero ? 0 : 1;
+
+ // A war with a maxInactive of 3 secs and a maxUnreplicated of 0 or 1
+ DataSourcePersistentManager[] mgrs = getCacheManagers(warname, 3, maxUnrep);
+ DataSourcePersistentManager mgr0 = mgrs[0];
+ DataSourcePersistentManager mgr1 = mgrs[1];
+
+ // Establish session.
+ SetAttributesRequestHandler setHandler = new SetAttributesRequestHandler(allAttributes, false);
+ SessionTestUtil.invokeRequest(mgr0, setHandler, null);
+
+ validateNewSession(setHandler);
+
+ Thread.sleep(1050);
+
+ // Now make a request that will not trigger replication unless the interval is exceeded
+ BasicRequestHandler getHandler = new BasicRequestHandler(immutables.keySet(), false);
+ SessionTestUtil.invokeRequest(mgr0, getHandler, setHandler.getSessionId());
+
+ validateExpectedAttributes(immutables, getHandler);
+
+ // Sleep long enough that the session will be expired on other server
+ // if previous request didn't keep it alive
+ Thread.sleep(2000);
+
+ // Fail over and confirm all is well
+ getHandler = new BasicRequestHandler(allAttributes.keySet(), false);
+ SessionTestUtil.invokeRequest(mgr1, getHandler, setHandler.getSessionId());
+
+ validateExpectedAttributes(allAttributes, getHandler);
+ }
+
+ /**
+ * Tests that setting a maxUnreplicatedInterval of 1 second prevents
+ * timestamp replication during read-only requests during that one second.
+ * Test makes a read-only request during the 1 second maxUnreplicatedInterval,
+ * which should prevent timestamp replication. Test then waits long enough
+ * for the session to be considered expired on the remote node only if the
+ * timestamp wasn't replicated. Test fails over to remote node and confirms
+ * that the session was expired.
+ *
+ * @throws Exception
+ */
+ public void testMaxIntervalPreventsReplication() throws Exception
+ {
+ log.info("++++ Starting testMaxIntervalPreventsReplication ++++");
+
+ String warname = String.valueOf(++testId);
+
+ // A war with a maxInactive of 3 secs and a maxUnreplicated of 1
+ DataSourcePersistentManager[] mgrs = getCacheManagers(warname, 3, 1);
+ DataSourcePersistentManager mgr0 = mgrs[0];
+ DataSourcePersistentManager mgr1 = mgrs[1];
+
+ SetAttributesRequestHandler setHandler = new SetAttributesRequestHandler(allAttributes, false);
+ SessionTestUtil.invokeRequest(mgr0, setHandler, null);
+
+ // Sleep less than the maxUnreplicated time so next request shouldn't trigger timestamp repl
+ Thread.sleep(500);
+
+ // Now make a request that will not trigger replication unless the interval is exceeded
+ BasicRequestHandler getHandler = new BasicRequestHandler(immutables.keySet(), false);
+ SessionTestUtil.invokeRequest(mgr0, getHandler, setHandler.getSessionId());
+
+ validateExpectedAttributes(immutables, getHandler);
+
+ // Sleep long enough that the session will be expired on other server
+ // if previous request didn't keep it alive
+ Thread.sleep(2600);
+
+ // Fail over and confirm the session was expired
+ getHandler = new BasicRequestHandler(allAttributes.keySet(), false);
+ SessionTestUtil.invokeRequest(mgr1, getHandler, setHandler.getSessionId());
+
+ validateNewSession(getHandler);
+ }
+
+ /**
+ * Confirms that the "grace period" that maxUnreplicatedInterval adds to the
+ * removal of overaged unloaded sessions in remote caches delays their
+ * removal.
+ *
+ * COMMENTED OUT BECAUSE the whole idea doesn't work. The mgr1 that isn't
+ * aware of the mgr0 activity does an outdated check against db and finds
+ * out
+ *
+ * @throws Exception
+ */
+// public void testRemoteExpirationGracePeriod() throws Exception
+// {
+// log.info("++++ Starting testRemoteExpirationGracePeriod ++++");
+//
+// String warname = String.valueOf(++testId);
+//
+// DataSourcePersistentManager[] mgrs = getCacheManagers(warname, 3, 2);
+// DataSourcePersistentManager mgr0 = mgrs[0];
+// DataSourcePersistentManager mgr1 = mgrs[1];
+//
+// // Establish a session on mgr1
+// BasicRequestHandler getHandler = new BasicRequestHandler(immutables.keySet(), false);
+// SessionTestUtil.invokeRequest(mgr1, getHandler, null);
+//
+// String session1Id = getHandler.getSessionId();
+//
+// getHandler = new BasicRequestHandler(immutables.keySet(), false);
+// SessionTestUtil.invokeRequest(mgr1, getHandler, null);
+//
+// String session2Id = getHandler.getSessionId();
+//
+// // Modify on mgr0
+// SetAttributesRequestHandler setHandler = new SetAttributesRequestHandler(allAttributes, false);
+// SessionTestUtil.invokeRequest(mgr0, setHandler, session1Id);
+// setHandler = new SetAttributesRequestHandler(allAttributes, false);
+// SessionTestUtil.invokeRequest(mgr0, setHandler, session2Id);
+//
+// // Sanity check of the DB
+// assertNotNull(PersistentSessionTestUtil.getSessionVersion(PersistentSessionTestUtil.getDataSource(), session1Id, mgr0.getContainer().getName()));
+// assertNotNull(PersistentSessionTestUtil.getSessionVersion(PersistentSessionTestUtil.getDataSource(), session2Id, mgr0.getContainer().getName()));
+//
+// // Overage the session
+// Thread.sleep(3010);
+// // Try to force out the overaged session
+// mgr1.backgroundProcess();
+// // Confirm they are still there
+// assertNotNull(PersistentSessionTestUtil.getSessionVersion(PersistentSessionTestUtil.getDataSource(), session1Id, mgr0.getContainer().getName()));
+// assertNotNull(PersistentSessionTestUtil.getSessionVersion(PersistentSessionTestUtil.getDataSource(), session2Id, mgr0.getContainer().getName()));
+//
+// // Access one to prove it gets expired once the manager can see its real timestamp
+// getHandler = new BasicRequestHandler(allAttributes.keySet(), false);
+// SessionTestUtil.invokeRequest(mgr1, getHandler, session1Id);
+// validateNewSession(getHandler);
+//
+// // Sleep past the grace period
+// Thread.sleep(2010);
+// // The get restored a new fresh session with the first id, but the 2nd
+// // one is still there and overaged. Try to force it out
+// mgr1.backgroundProcess();
+// assertNull(PersistentSessionTestUtil.getSessionVersion(PersistentSessionTestUtil.getDataSource(), session2Id, mgr0.getContainer().getName()));
+// }
+
+ protected DataSourcePersistentManager[] getCacheManagers(String warname, int maxInactive, int maxUnreplicated)
+ throws Exception
+ {
+ DataSourcePersistentManager mgr0 = PersistentSessionTestUtil.createManager(warname, maxInactive, null);
+ PersistentSessionTestUtil.configureManager(mgr0, getReplicationGranularity(), getReplicationTrigger(), true, maxUnreplicated);
+ this.managers.add(mgr0);
+ mgr0.start();
+
+ DataSourcePersistentManager mgr1 = PersistentSessionTestUtil.createManager(warname, maxInactive, null);
+ PersistentSessionTestUtil.configureManager(mgr1, getReplicationGranularity(), getReplicationTrigger(), true, maxUnreplicated);
+ this.managers.add(mgr1);
+ mgr1.start();
+
+ return new DataSourcePersistentManager[]{mgr0, mgr1};
+ }
+
+ protected void validateExpectedAttributes(Map<String, Object> expected, BasicRequestHandler handler)
+ {
+ assertFalse(handler.isNewSession());
+
+ if (handler.isCheckAttributeNames())
+ {
+ assertEquals(expected.size(), handler.getAttributeNames().size());
+ }
+ Map<String, Object> checked = handler.getCheckedAttributes();
+ assertEquals(expected.size(), checked.size());
+ for (Map.Entry<String, Object> entry : checked.entrySet())
+ assertEquals(entry.getKey(), expected.get(entry.getKey()), entry.getValue());
+
+ }
+
+ protected void validateNewSession(BasicRequestHandler handler)
+ {
+ assertTrue(handler.isNewSession());
+ assertEquals(handler.getCreationTime(), handler.getLastAccessedTime());
+ if (handler.isCheckAttributeNames())
+ {
+ assertEquals(0, handler.getAttributeNames().size());
+ }
+ Map<String, Object> checked = handler.getCheckedAttributes();
+ for (Map.Entry<String, Object> entry : checked.entrySet())
+ assertNull(entry.getKey(), entry.getValue());
+ }
+
+
+}
Copied: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/PersistentStoreMemoryLeakTestCase.java (from rev 91184, branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/PersistentStoreMemoryLeakTestCase.java)
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/PersistentStoreMemoryLeakTestCase.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/PersistentStoreMemoryLeakTestCase.java 2009-07-14 15:00:09 UTC (rev 91219)
@@ -0,0 +1,476 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.cluster.defaultcfg.simpleweb.test;
+
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.lang.ref.WeakReference;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.WeakHashMap;
+
+import junit.framework.Test;
+
+import org.apache.catalina.Session;
+import org.jboss.cache.pojo.PojoCache;
+import org.jboss.logging.Logger;
+import org.jboss.metadata.web.jboss.ReplicationGranularity;
+import org.jboss.metadata.web.jboss.ReplicationTrigger;
+import org.jboss.test.JBossTestCase;
+import org.jboss.test.cluster.testutil.SessionTestUtil;
+import org.jboss.test.cluster.web.mocks.BasicRequestHandler;
+import org.jboss.test.cluster.web.mocks.InvalidateSessionRequestHandler;
+import org.jboss.test.cluster.web.mocks.RemoveAttributesRequestHandler;
+import org.jboss.test.cluster.web.mocks.SetAttributesRequestHandler;
+import org.jboss.test.cluster.web.notification.SessionSpecListenerAttribute;
+import org.jboss.test.cluster.web.persistent.PersistentSessionTestUtil;
+import org.jboss.test.cluster.web.persistent.SimplePersistentStoreTestSetup;
+import org.jboss.web.tomcat.service.session.persistent.DataSourcePersistentManager;
+
+/**
+ * Tests that references to cached sessions and attributes are released.
+ *
+ * @author Brian Stansberry
+ */
+public class PersistentStoreMemoryLeakTestCase extends JBossTestCase
+{
+ protected static PojoCache[] pojoCaches = new PojoCache[2];
+
+ protected static long testId = System.currentTimeMillis();
+
+ public static final String KEY = "Key";
+ public static final Set<String> KEYS = new HashSet<String>();
+ static
+ {
+ KEYS.add(KEY);
+ }
+
+ protected Logger log = Logger.getLogger(getClass());
+
+ protected Set<DataSourcePersistentManager> managers = new HashSet<DataSourcePersistentManager>();
+
+ public PersistentStoreMemoryLeakTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite() throws Exception
+ {
+ return SimplePersistentStoreTestSetup.getDeploySetup(PersistentStoreMemoryLeakTestCase.class);
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ cleanHeap();
+
+ super.tearDown();
+
+ for (DataSourcePersistentManager manager : managers)
+ {
+ try
+ {
+ manager.stop();
+ }
+ catch (RuntimeException ignored)
+ {
+ log.debug("tearDown(): Caught exception cleaning up manager -- " + ignored.getLocalizedMessage());
+ }
+ }
+ managers.clear();
+
+ SessionSpecListenerAttribute.invocations.clear();
+
+ Attribute.clear();
+ System.gc();
+ }
+
+ protected ReplicationGranularity getReplicationGranularity()
+ {
+ return ReplicationGranularity.SESSION;
+ }
+
+ protected ReplicationTrigger getReplicationTrigger()
+ {
+ return ReplicationTrigger.SET_AND_NON_PRIMITIVE_GET;
+ }
+
+ public void testSessionLifecycle() throws Exception
+ {
+ log.info("++++ Starting testSessionLifecycle ++++");
+ String warname = String.valueOf(++testId);
+
+ // A war with a maxInactive of 30 mins maxUnreplicated of 0
+ DataSourcePersistentManager[] mgrs = getCacheManagers(warname, 1800, 1);
+ DataSourcePersistentManager mgr0 = mgrs[0];
+ DataSourcePersistentManager mgr1 = mgrs[1];
+
+
+ // Initial request
+ SetAttributesRequestHandler setHandler = new SetAttributesRequestHandler(getAttributeMap(), false);
+ log.info("initial request");
+ SessionTestUtil.invokeRequest(mgr0, setHandler, null);
+
+ String sessionId = setHandler.getSessionId();
+ WeakReference<Session> session0A = new WeakReference<Session>(mgr0.findSession(sessionId));
+ SessionTestUtil.cleanupPipeline(mgr0);
+ assertNotNull(session0A.get());
+
+ // Modify attribute request
+ setHandler = new SetAttributesRequestHandler(getAttributeMap(), false);
+ log.info("Modify attribute request");
+ SessionTestUtil.invokeRequest(mgr0, setHandler, sessionId);
+ SessionTestUtil.cleanupPipeline(mgr0);
+
+ cleanHeap();
+ assertAttributeCount(1);
+
+ // Passivate
+ Thread.sleep(1100);
+
+ log.info("passivate node 0");
+ mgr0.backgroundProcess();
+ log.info("passivate node 1");
+ mgr1.backgroundProcess();
+
+ cleanHeap();
+ assertAttributeCount(0);
+ assertNullReference(session0A);
+
+ // Remove attribute request
+ RemoveAttributesRequestHandler removeHandler = new RemoveAttributesRequestHandler(KEYS, false);
+ log.info("remove request");
+ SessionTestUtil.invokeRequest(mgr0, removeHandler, sessionId);
+
+ WeakReference<Session> session0B = new WeakReference<Session>(mgr0.findSession(sessionId));
+ SessionTestUtil.cleanupPipeline(mgr0);
+ cleanHeap();
+ assertAttributeCount(0);
+ assertNotNull(session0B.get());
+
+ // Failover request
+ setHandler = new SetAttributesRequestHandler(getAttributeMap(), false);
+ log.info("failover request");
+ SessionTestUtil.invokeRequest(mgr1, setHandler, sessionId);
+
+ WeakReference<Session> session1A = new WeakReference<Session>(mgr1.findSession(sessionId));
+ SessionTestUtil.cleanupPipeline(mgr1);
+ assertNotNull(session1A.get());
+ assertAttributeCount(1);
+
+ // Passivate
+ Thread.sleep(1100);
+
+ log.info("passivate node 0");
+ mgr0.backgroundProcess();
+ log.info("passivate node 1");
+ mgr1.backgroundProcess();
+
+ cleanHeap();
+ assertAttributeCount(0);
+ assertNullReference(session0B);
+ assertNullReference(session1A);
+
+ // Reactivate
+ BasicRequestHandler getHandler = new BasicRequestHandler(KEYS, false);
+ log.info("activate node 1");
+ SessionTestUtil.invokeRequest(mgr1, getHandler, sessionId);
+
+ WeakReference<Session> session1B = new WeakReference<Session>(mgr1.findSession(sessionId));
+ SessionTestUtil.cleanupPipeline(mgr1);
+ assertNotNull(session1B.get());
+ assertAttributeCount(1);
+
+ // Fail back
+ getHandler = new BasicRequestHandler(KEYS, false);
+ log.info("fail back request");
+ SessionTestUtil.invokeRequest(mgr0, getHandler, sessionId);
+
+ WeakReference<Session> session0C = new WeakReference<Session>(mgr0.findSession(sessionId));
+ SessionTestUtil.cleanupPipeline(mgr0);
+ assertNotNull(session0C.get());
+ assertAttributeCount(2);
+
+ // Invalidate session
+ InvalidateSessionRequestHandler invalidateHandler = new InvalidateSessionRequestHandler(KEYS, false);
+ log.info("invalidate request");
+ SessionTestUtil.invokeRequest(mgr0, invalidateHandler, sessionId);
+ SessionTestUtil.cleanupPipeline(mgr0);
+
+ cleanHeap();
+ assertNotNull(session1B.get());
+ assertNullReference(session0C);
+ assertAttributeCount(1);
+
+ // Make mgr1 aware of the invalidation
+ getHandler = new BasicRequestHandler(KEYS, false);
+ SessionTestUtil.invokeRequest(mgr1, getHandler, sessionId);
+
+ cleanHeap();
+ assertNullReference(session1B);
+ assertAttributeCount(0);
+ }
+
+ public void testSessionExpiration() throws Exception
+ {
+ log.info("++++ Starting testSessionExpiration ++++");
+ String warname = String.valueOf(++testId);
+
+ // A war with a maxInactive of 2 secs and a maxIdle of 10 (don't passivate)
+ DataSourcePersistentManager[] mgrs = getCacheManagers(warname, 2, 10);
+ DataSourcePersistentManager mgr0 = mgrs[0];
+ DataSourcePersistentManager mgr1 = mgrs[1];
+
+ // Initial request
+ SetAttributesRequestHandler setHandler = new SetAttributesRequestHandler(getAttributeMap(), false);
+ log.info("initial request");
+ SessionTestUtil.invokeRequest(mgr0, setHandler, null);
+ assertAttributeCount(1);
+
+ String sessionId = setHandler.getSessionId();
+ WeakReference<Session> session0A = new WeakReference<Session>(mgr0.findSession(sessionId));
+ SessionTestUtil.cleanupPipeline(mgr0);
+ assertNotNull(session0A.get());
+ assertAttributeCount(1);
+
+ // Failover request
+ setHandler = new SetAttributesRequestHandler(getAttributeMap(), false);
+ log.info("fail over request");
+ SessionTestUtil.invokeRequest(mgr1, setHandler, sessionId);
+ assertNotNull(setHandler.getCheckedAttributes().get(KEY));
+ assertEquals(Attribute.COUNT -1, ((Attribute) setHandler.getCheckedAttributes().get(KEY)).getCount());
+
+ WeakReference<Session> session1A = new WeakReference<Session>(mgr1.findSession(sessionId));
+ SessionTestUtil.cleanupPipeline(mgr1);
+
+ cleanHeap();
+ assertNotNull(session1A.get());
+ assertAttributeCount(2);
+
+ // Expire
+ Thread.sleep(2100);
+
+ log.info("expire node 0");
+ mgr0.backgroundProcess();
+ log.info("expire node 1");
+ mgr1.backgroundProcess();
+
+ cleanHeap();
+ assertNullReference(session0A);
+ assertNullReference(session1A);
+ assertAttributeCount(0);
+ }
+
+ private void cleanHeap()
+ {
+ System.gc();
+ System.runFinalization();
+ System.gc();
+ System.runFinalization();
+ System.gc();
+ log.debug("Heap cleaned");
+ }
+
+ private void assertNullReference(WeakReference<?> ref)
+ {
+ long limit = System.currentTimeMillis() + 2500;
+ while (ref.get() != null && System.currentTimeMillis() < limit)
+ {
+ cleanHeap();
+ if (ref.get() != null)
+ {
+ try
+ {
+ Thread.sleep(50);
+ }
+ catch (InterruptedException e)
+ {
+ Thread.currentThread().interrupt();
+ log.warn("interrupted");
+ break;
+ }
+ }
+ }
+ assertNull(ref.get());
+ }
+
+ private void assertAttributeCount(int expected)
+ {
+ long limit = System.currentTimeMillis() + 2500;
+ while (Attribute.attributeCount() > expected && System.currentTimeMillis() < limit)
+ {
+ cleanHeap();
+ if (Attribute.attributeCount() > expected)
+ {
+ try
+ {
+ Thread.sleep(50);
+ }
+ catch (InterruptedException e)
+ {
+ Thread.currentThread().interrupt();
+ log.warn("interrupted");
+ break;
+ }
+ }
+ }
+ assertEquals(expected, Attribute.attributeCount());
+ }
+
+ public void testUndeploy() throws Exception
+ {
+ log.info("++++ Starting testUndeploy ++++");
+ String warname = String.valueOf(++testId);
+
+ // A war with a maxInactive of 30 mins and no maxIdle
+ DataSourcePersistentManager[] mgrs = getCacheManagers(warname, 1800, -1);
+ DataSourcePersistentManager mgr0 = mgrs[0];
+ DataSourcePersistentManager mgr1 = mgrs[1];
+
+ // Initial request
+ SetAttributesRequestHandler setHandler = new SetAttributesRequestHandler(getAttributeMap(), false);
+ SessionTestUtil.invokeRequest(mgr0, setHandler, null);
+ assertAttributeCount(1);
+
+ String sessionId = setHandler.getSessionId();
+ WeakReference<Session> session0A = new WeakReference<Session>(mgr0.findSession(sessionId));
+ SessionTestUtil.cleanupPipeline(mgr0);
+ assertNotNull(session0A.get());
+
+ mgr0.stop();
+ mgr1.stop();
+
+ cleanHeap();
+ assertNull(session0A.get());
+ assertAttributeCount(0);
+ }
+
+ protected DataSourcePersistentManager[] getCacheManagers(String warname, int maxInactive, int maxIdle)
+ throws Exception
+ {
+ DataSourcePersistentManager mgr0 = PersistentSessionTestUtil.createManager(warname, maxInactive, null);
+ PersistentSessionTestUtil.configureManager(mgr0, getReplicationGranularity(), getReplicationTrigger(), -1, maxIdle > 0, maxIdle, -1 ,false, 0);
+ this.managers.add(mgr0);
+ mgr0.start();
+
+ DataSourcePersistentManager mgr1 = PersistentSessionTestUtil.createManager(warname, maxInactive, null);
+ PersistentSessionTestUtil.configureManager(mgr1, getReplicationGranularity(), getReplicationTrigger(), -1, true, maxIdle, -1 ,false, 0);
+ this.managers.add(mgr1);
+ mgr1.start();
+
+ return new DataSourcePersistentManager[]{mgr0, mgr1};
+ }
+
+ private static Map<String, Object> getAttributeMap()
+ {
+ Object val = Attribute.newAttribute();
+ return Collections.singletonMap(KEY, val);
+ }
+
+ /** Class that keeps track of all its instances */
+ private static class Attribute implements Serializable
+ {
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+ private static final Logger log = Logger.getLogger(Attribute.class);
+
+ public static int COUNT = 0;
+
+ private static final WeakHashMap<Attribute, String> attributes = new WeakHashMap<Attribute, String>();
+
+ private final int count;
+
+ static Attribute newAttribute()
+ {
+ log.info("Attribute: new Attribute");
+ return getAttribute(++COUNT);
+ }
+
+ private static Attribute getAttribute(int count)
+ {
+ Attribute a = new Attribute(count);
+ attributes.put(a, "value");
+ log.info("Stored ref to Attribute@" + System.identityHashCode(a));
+ return a;
+ }
+
+ private static void clear()
+ {
+ attributes.clear();
+ }
+
+ private Attribute(int count)
+ {
+ this.count = count;
+ }
+
+ static int attributeCount()
+ {
+ return attributes.size();
+ }
+
+ public int getCount()
+ {
+ return count;
+ }
+
+ private Object writeReplace() throws ObjectStreamException
+ {
+ log.info("Attribute: serialized");
+ return new SerializedForm(count);
+ }
+
+ private static class SerializedForm implements Serializable
+ {
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+ private final int count;
+
+ private SerializedForm(int count)
+ {
+ this.count = count;
+ }
+
+ private Object readResolve() throws ObjectStreamException
+ {
+ log.info("Attribute: deserialized");
+ return getAttribute(count);
+ }
+ }
+
+ @Override
+ protected void finalize() throws Throwable
+ {
+ log.info("Attribute@" + System.identityHashCode(this) + " finalized");
+ super.finalize();
+ }
+
+
+
+ }
+
+}
Copied: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/PersistentStoreSessionCountUnitTestCase.java (from rev 91184, branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/PersistentStoreSessionCountUnitTestCase.java)
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/PersistentStoreSessionCountUnitTestCase.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/PersistentStoreSessionCountUnitTestCase.java 2009-07-14 15:00:09 UTC (rev 91219)
@@ -0,0 +1,631 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.cluster.defaultcfg.simpleweb.test;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+
+import org.apache.catalina.Manager;
+import org.apache.catalina.Session;
+import org.jboss.logging.Logger;
+import org.jboss.test.cluster.testutil.SessionTestUtil;
+import org.jboss.test.cluster.web.persistent.PersistentSessionTestUtil;
+import org.jboss.test.cluster.web.persistent.SimplePersistentStoreTestSetup;
+import org.jboss.web.tomcat.service.session.persistent.DataSourcePersistentManager;
+
+/**
+ * Unit tests of session count management with a persistent manager.
+ *
+ * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
+ * @version $Revision: 85945 $
+ */
+public class PersistentStoreSessionCountUnitTestCase extends TestCase
+{
+ private static final Logger log = Logger.getLogger(PersistentStoreSessionCountUnitTestCase.class);
+
+ private static long testCount = System.currentTimeMillis();
+
+ /**
+ * Create a new SessionCountUnitTestCase.
+ *
+ * @param name
+ */
+ public PersistentStoreSessionCountUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite() throws Exception
+ {
+ return SimplePersistentStoreTestSetup.getDeploySetup(PersistentStoreSessionCountUnitTestCase.class);
+ }
+
+ public void testStandaloneMaxSessions() throws Exception
+ {
+ log.info("Enter testStandaloneMaxSessions");
+
+ ++testCount;
+
+ DataSourcePersistentManager mgr = PersistentSessionTestUtil.createManager("test" + testCount, 5, null);
+ PersistentSessionTestUtil.configureManager(mgr, 2);
+
+ mgr.start();
+
+ assertFalse("Passivation is disabled", mgr.isPassivationEnabled());
+ assertEquals("Correct max active count", 2, mgr.getMaxActiveAllowed());
+
+ // Set up a session
+ Session sess1 = createAndUseSession(mgr, "1", true, true);
+
+ assertEquals("Session count correct", 1, mgr.getActiveSessionCount());
+ assertEquals("Local session count correct", 1, mgr.getLocalActiveSessionCount());
+
+ createAndUseSession(mgr, "2", true, true);
+
+ assertEquals("Session count correct", 2, mgr.getActiveSessionCount());
+ assertEquals("Local session count correct", 2, mgr.getLocalActiveSessionCount());
+
+ // Should fail to create a 3rd
+ createAndUseSession(mgr, "3", false, false);
+
+ // Confirm a session timeout clears space
+ sess1.setMaxInactiveInterval(1);
+ SessionTestUtil.sleepThread(1100);
+
+ createAndUseSession(mgr, "3", true, true);
+
+ assertEquals("Session count correct", 2, mgr.getActiveSessionCount());
+ assertEquals("Local session count correct", 2, mgr.getLocalActiveSessionCount());
+ assertEquals("Created session count correct", 3, mgr.getCreatedSessionCount());
+ assertEquals("Expired session count correct", 1, mgr.getExpiredSessionCount());
+ }
+
+ public void testStandaloneMaxSessionsWithMaxIdle()
+ throws Exception
+ {
+ log.info("Enter testStandaloneMaxSessionsWithMaxIdle");
+
+ ++testCount;
+ DataSourcePersistentManager mgr = PersistentSessionTestUtil.createManager("test" + testCount, 5, null);
+
+ PersistentSessionTestUtil.configureManager(mgr, 1, true, 1, -1);
+
+ mgr.start();
+
+ assertTrue("Passivation is enabled", mgr.isPassivationEnabled());
+ assertEquals("Correct max active count", 1, mgr.getMaxActiveAllowed());
+ assertEquals("Correct max idle time", 1, mgr.getPassivationMaxIdleTime());
+ assertEquals("Correct min idle time", -1, mgr.getPassivationMinIdleTime());
+
+ // Set up a session
+ Session sess1 = createAndUseSession(mgr, "1", true, true);
+
+ assertEquals("Session count correct", 1, mgr.getActiveSessionCount());
+ assertEquals("Local session count correct", 1, mgr.getLocalActiveSessionCount());
+
+ // Should fail to create a 2nd
+ createAndUseSession(mgr, "2", false, false);
+
+ // Confirm a session timeout clears space
+ sess1.setMaxInactiveInterval(1);
+ SessionTestUtil.sleepThread(1100);
+
+ createAndUseSession(mgr, "2", true, true);
+
+ assertEquals("Session count correct", 1, mgr.getActiveSessionCount());
+ assertEquals("Local session count correct", 1, mgr.getLocalActiveSessionCount());
+ assertEquals("Created session count correct", 2, mgr.getCreatedSessionCount());
+ assertEquals("Expired session count correct", 1, mgr.getExpiredSessionCount());
+ assertEquals("Passivated session count correct", 0, mgr.getPassivatedSessionCount());
+
+ // Sleep past maxIdleTime
+ SessionTestUtil.sleepThread(1100);
+
+ assertEquals("Passivated session count correct", 0, mgr.getPassivatedSessionCount());
+
+ createAndUseSession(mgr, "3", true, true);
+
+ assertEquals("Session count correct", 1, mgr.getActiveSessionCount());
+ assertEquals("Local session count correct", 1, mgr.getLocalActiveSessionCount());
+ assertEquals("Created session count correct", 3, mgr.getCreatedSessionCount());
+ assertEquals("Expired session count correct", 1, mgr.getExpiredSessionCount());
+ assertEquals("Passivated session count correct", 1, mgr.getPassivatedSessionCount());
+
+ }
+
+ public void testStandaloneMaxSessionsWithMinIdle() throws Exception
+ {
+ log.info("Enter testStandaloneMaxSessionsWithMinIdle");
+
+ ++testCount;
+ DataSourcePersistentManager mgr = PersistentSessionTestUtil.createManager("test" + testCount, 5, null);
+
+ PersistentSessionTestUtil.configureManager(mgr, 1, true, 3, 1);
+
+ mgr.start();
+
+ assertTrue("Passivation is enabled", mgr.isPassivationEnabled());
+ assertEquals("Correct max active count", 1, mgr.getMaxActiveAllowed());
+ assertEquals("Correct max idle time", 3, mgr.getPassivationMaxIdleTime());
+ assertEquals("Correct min idle time", 1, mgr.getPassivationMinIdleTime());
+
+ // Set up a session
+ Session sess1 = createAndUseSession(mgr, "1", true, true);
+
+ assertEquals("Session count correct", 1, mgr.getActiveSessionCount());
+ assertEquals("Local session count correct", 1, mgr.getLocalActiveSessionCount());
+
+ // Should fail to create a 2nd
+ createAndUseSession(mgr, "2", false, false);
+
+ // Confirm a session timeout clears space
+ sess1.setMaxInactiveInterval(1);
+ SessionTestUtil.sleepThread(1100);
+
+ createAndUseSession(mgr, "2", true, false);
+
+ assertEquals("Session count correct", 1, mgr.getActiveSessionCount());
+ assertEquals("Local session count correct", 1, mgr.getLocalActiveSessionCount());
+ assertEquals("Created session count correct", 2, mgr.getCreatedSessionCount());
+ assertEquals("Expired session count correct", 1, mgr.getExpiredSessionCount());
+
+ // Sleep past minIdleTime
+ SessionTestUtil.sleepThread(1100);
+
+// assertTrue("Session 2 still valid", sess2.isValid());
+ assertEquals("Passivated session count correct", 0, mgr.getPassivatedSessionCount());
+
+ createAndUseSession(mgr, "3", true, true);
+
+ assertEquals("Session count correct", 1, mgr.getActiveSessionCount());
+ assertEquals("Local session count correct", 1, mgr.getLocalActiveSessionCount());
+ assertEquals("Created session count correct", 3, mgr.getCreatedSessionCount());
+ assertEquals("Expired session count correct", 1, mgr.getExpiredSessionCount());
+ assertEquals("Passivated session count correct", 1, mgr.getPassivatedSessionCount());
+ }
+
+ public void testReplicatedMaxSessions() throws Exception
+ {
+ log.info("Enter testReplicatedMaxSessions");
+
+ ++testCount;
+ DataSourcePersistentManager mgr0 = PersistentSessionTestUtil.createManager("test" + testCount, 1, null);
+ PersistentSessionTestUtil.configureManager(mgr0, 1);
+
+ mgr0.start();
+
+ assertFalse("Passivation is disabled", mgr0.isPassivationEnabled());
+ assertEquals("Correct max active count", 1, mgr0.getMaxActiveAllowed());
+ assertEquals("Correct max inactive interval", 1, mgr0.getMaxInactiveInterval());
+
+ DataSourcePersistentManager mgr1 = PersistentSessionTestUtil.createManager("test" + testCount, 1, null);
+ PersistentSessionTestUtil.configureManager(mgr1, 1);
+
+ mgr1.start();
+
+ assertFalse("Passivation is disabled", mgr1.isPassivationEnabled());
+ assertEquals("Correct max active count", 1, mgr1.getMaxActiveAllowed());
+ assertEquals("Correct max inactive interval", 1, mgr1.getMaxInactiveInterval());
+
+ // Set up a session
+ createAndUseSession(mgr0, "1", true, true);
+
+ assertEquals("Session count correct", 1, mgr0.getActiveSessionCount());
+ assertEquals("Local session count correct", 1, mgr0.getLocalActiveSessionCount());
+ assertEquals("Session count correct", 0, mgr1.getActiveSessionCount());
+ assertEquals("Local session count correct", 0, mgr1.getLocalActiveSessionCount());
+
+ // Get it in-memory on mgr1 as well
+ Session sess1 = useSession(mgr1, "1");
+
+ // A 2nd session should fail
+ createAndUseSession(mgr0, "2", false, false);
+ createAndUseSession(mgr1, "2", false, false);
+
+ // Confirm a session timeout clears space
+ sess1.setMaxInactiveInterval(1);
+ useSession(mgr1, "1");
+ useSession(mgr0, "1");
+ SessionTestUtil.sleepThread(mgr0.getMaxInactiveInterval() * 1000 + 100);
+
+ createAndUseSession(mgr0, "2", true, true);
+ createAndUseSession(mgr1, "3", true, true);
+
+ assertEquals("Session count correct", 1, mgr0.getActiveSessionCount());
+ assertEquals("Local session count correct", 1, mgr0.getLocalActiveSessionCount());
+ assertEquals("Created session count correct", 2, mgr0.getCreatedSessionCount());
+ assertEquals("Expired session count correct", 1, mgr0.getExpiredSessionCount());
+
+ assertEquals("Session count correct", 1, mgr1.getActiveSessionCount());
+ assertEquals("Local session count correct", 1, mgr1.getLocalActiveSessionCount());
+ assertEquals("Created session count correct", 1, mgr1.getCreatedSessionCount());
+ assertEquals("Expired session count correct", 1, mgr1.getExpiredSessionCount());
+ }
+
+ public void testReplicatedMaxSessionsWithMaxIdle() throws Exception
+ {
+ log.info("Enter testReplicatedMaxSessionsWithMaxIdle");
+
+ ++testCount;
+ DataSourcePersistentManager mgr0 = PersistentSessionTestUtil.createManager("test" + testCount, 5, null);
+ PersistentSessionTestUtil.configureManager(mgr0, 1, true, 1, -1);
+
+ mgr0.start();
+
+ assertTrue("Passivation is enabled", mgr0.isPassivationEnabled());
+ assertEquals("Correct max active count", 1, mgr0.getMaxActiveAllowed());
+ assertEquals("Correct max idle time", 1, mgr0.getPassivationMaxIdleTime());
+ assertEquals("Correct min idle time", -1, mgr0.getPassivationMinIdleTime());
+
+ DataSourcePersistentManager mgr1 = PersistentSessionTestUtil.createManager("test" + testCount, 5, null);
+ PersistentSessionTestUtil.configureManager(mgr1, 1, true, 1, -1);
+
+ mgr1.start();
+
+ assertTrue("Passivation is enabled", mgr1.isPassivationEnabled());
+ assertEquals("Correct max active count", 1, mgr1.getMaxActiveAllowed());
+ assertEquals("Correct max idle time", 1, mgr1.getPassivationMaxIdleTime());
+ assertEquals("Correct min idle time", -1, mgr1.getPassivationMinIdleTime());
+
+ // Set up a session
+ createAndUseSession(mgr0, "1", true, true);
+
+ assertEquals("Session count correct", 1, mgr0.getActiveSessionCount());
+ assertEquals("Local session count correct", 1, mgr0.getLocalActiveSessionCount());
+ assertEquals("Passivated session count correct", 0, mgr0.getPassivatedSessionCount());
+ assertEquals("Expired session count correct", 0, mgr0.getExpiredSessionCount());
+ assertEquals("Session count correct", 0, mgr1.getActiveSessionCount());
+ assertEquals("Local session count correct", 0, mgr1.getLocalActiveSessionCount());
+ assertEquals("Passivated session count correct", 0, mgr1.getPassivatedSessionCount());
+ assertEquals("Expired session count correct", 0, mgr1.getExpiredSessionCount());
+
+ // Get it in-memory on mgr1 as well
+ useSession(mgr1, "1");
+
+ // A 2nd session should fail
+ createAndUseSession(mgr0, "2", false, false);
+ createAndUseSession(mgr1, "2", false, false);
+
+ // Sleep past maxIdleTime
+ SessionTestUtil.sleepThread(1100);
+
+ assertEquals("Passivated session count correct", 0, mgr1.getPassivatedSessionCount());
+
+ createAndUseSession(mgr1, "2", true, true);
+ createAndUseSession(mgr0, "3", true, true);
+
+ assertEquals("Session count correct", 1, mgr0.getActiveSessionCount());
+ assertEquals("Local session count correct", 1, mgr0.getLocalActiveSessionCount());
+ assertEquals("Created session count correct", 2, mgr0.getCreatedSessionCount());
+ assertEquals("Expired session count correct", 0, mgr0.getExpiredSessionCount());
+ assertEquals("Passivated session count correct", 1, mgr0.getPassivatedSessionCount());
+
+ assertEquals("Session count correct", 1, mgr1.getActiveSessionCount());
+ assertEquals("Local session count correct", 1, mgr1.getLocalActiveSessionCount());
+ assertEquals("Created session count correct", 1, mgr1.getCreatedSessionCount());
+ assertEquals("Expired session count correct", 0, mgr1.getExpiredSessionCount());
+ assertEquals("Passivated session count correct", 1, mgr1.getPassivatedSessionCount());
+ }
+
+ public void testReplicatedMaxSessionsWithMinIdle() throws Exception
+ {
+ log.info("Enter testReplicatedMaxSessionsWithMinIdle");
+
+ ++testCount;
+ DataSourcePersistentManager mgr0 = PersistentSessionTestUtil.createManager("test" + testCount, 5, null);
+ PersistentSessionTestUtil.configureManager(mgr0, 1, true, 3, 1);
+
+ mgr0.start();
+
+ assertTrue("Passivation is enabled", mgr0.isPassivationEnabled());
+ assertEquals("Correct max active count", 1, mgr0.getMaxActiveAllowed());
+ assertEquals("Correct max idle time", 3, mgr0.getPassivationMaxIdleTime());
+ assertEquals("Correct min idle time", 1, mgr0.getPassivationMinIdleTime());
+
+ DataSourcePersistentManager mgr1 = PersistentSessionTestUtil.createManager("test" + testCount, 5, null);
+ PersistentSessionTestUtil.configureManager(mgr1, 1, true, 3, 1);
+
+ mgr1.start();
+
+ assertTrue("Passivation is enabled", mgr1.isPassivationEnabled());
+ assertEquals("Correct max active count", 1, mgr1.getMaxActiveAllowed());
+ assertEquals("Correct max idle time", 3, mgr1.getPassivationMaxIdleTime());
+ assertEquals("Correct min idle time", 1, mgr1.getPassivationMinIdleTime());
+
+ // Set up a session
+ createAndUseSession(mgr0, "1", true, true);
+
+ assertEquals("Session count correct", 1, mgr0.getActiveSessionCount());
+ assertEquals("Local session count correct", 1, mgr0.getLocalActiveSessionCount());
+ assertEquals("Passivated session count correct", 0, mgr0.getPassivatedSessionCount());
+ assertEquals("Session count correct", 0, mgr1.getActiveSessionCount());
+ assertEquals("Local session count correct", 0, mgr1.getLocalActiveSessionCount());
+ assertEquals("Passivated session count correct", 0, mgr0.getPassivatedSessionCount());
+
+ // Get it in-memory on mgr1 as well
+ useSession(mgr1, "1");
+
+ // A 2nd session should fail
+ createAndUseSession(mgr0, "2", false, false);
+ createAndUseSession(mgr1, "2", false, false);
+
+ // Sleep past minIdleTime
+ SessionTestUtil.sleepThread(1100);
+
+ assertEquals("Passivated session count correct", 0, mgr1.getPassivatedSessionCount());
+
+ createAndUseSession(mgr1, "2", true, true);
+ createAndUseSession(mgr0, "3", true, true);
+
+ assertEquals("Session count correct", 1, mgr0.getActiveSessionCount());
+ assertEquals("Local session count correct", 1, mgr0.getLocalActiveSessionCount());
+ assertEquals("Created session count correct", 2, mgr0.getCreatedSessionCount());
+ assertEquals("Expired session count correct", 0, mgr0.getExpiredSessionCount());
+ assertEquals("Passivated session count correct", 1, mgr0.getPassivatedSessionCount());
+
+ assertEquals("Session count correct", 1, mgr1.getActiveSessionCount());
+ assertEquals("Local session count correct", 1, mgr1.getLocalActiveSessionCount());
+ assertEquals("Created session count correct", 1, mgr1.getCreatedSessionCount());
+ assertEquals("Expired session count correct", 0, mgr1.getExpiredSessionCount());
+ assertEquals("Passivated session count correct", 1, mgr1.getPassivatedSessionCount());
+
+ }
+
+ public void testStandaloneRedeploy() throws Exception
+ {
+ log.info("Enter testStandaloneRedeploy");
+ ++testCount;
+ DataSourcePersistentManager mgr = PersistentSessionTestUtil.createManager("test" + testCount, 300, null);
+ PersistentSessionTestUtil.configureManager(mgr, 2, true, 3, 1);
+
+ mgr.start();
+
+ assertTrue("Passivation is enabled", mgr.isPassivationEnabled());
+ assertEquals("Correct max active count", 2, mgr.getMaxActiveAllowed());
+ assertEquals("Correct max idle time", 3, mgr.getPassivationMaxIdleTime());
+ assertEquals("Correct min idle time", 1, mgr.getPassivationMinIdleTime());
+
+ // Set up a session
+ createAndUseSession(mgr, "1", true, true);
+
+ assertEquals("Session count correct", 1, mgr.getActiveSessionCount());
+ assertEquals("Local session count correct", 1, mgr.getLocalActiveSessionCount());
+
+ // And a 2nd
+ createAndUseSession(mgr, "2", true, true);
+
+ assertEquals("Session count correct", 2, mgr.getActiveSessionCount());
+ assertEquals("Local session count correct", 2, mgr.getLocalActiveSessionCount());
+ assertEquals("Created session count correct", 2, mgr.getCreatedSessionCount());
+ assertEquals("Expired session count correct", 0, mgr.getExpiredSessionCount());
+
+ // Sleep past minIdleTime
+ SessionTestUtil.sleepThread(1100);
+
+ assertEquals("Passivated session count correct", 0, mgr.getPassivatedSessionCount());
+
+ createAndUseSession(mgr, "3", true, true);
+
+ assertEquals("Session count correct", 2, mgr.getActiveSessionCount());
+ assertEquals("Local session count correct", 2, mgr.getLocalActiveSessionCount());
+ assertEquals("Created session count correct", 3, mgr.getCreatedSessionCount());
+ assertEquals("Expired session count correct", 0, mgr.getExpiredSessionCount());
+ assertEquals("Passivated session count correct", 1, mgr.getPassivatedSessionCount());
+
+ mgr.stop();
+
+ mgr = PersistentSessionTestUtil.createManager("test" + testCount, 5, null);
+ PersistentSessionTestUtil.configureManager(mgr, 2, true, 3, 1);
+
+ mgr.start();
+
+ assertTrue("Passivation is enabled", mgr.isPassivationEnabled());
+ assertEquals("Correct max active count", 2, mgr.getMaxActiveAllowed());
+ assertEquals("Correct max idle time", 3, mgr.getPassivationMaxIdleTime());
+ assertEquals("Correct min idle time", 1, mgr.getPassivationMinIdleTime());
+
+ assertEquals("Session count correct", 0, mgr.getActiveSessionCount());
+ assertEquals("Local session count correct", 0, mgr.getLocalActiveSessionCount());
+ assertEquals("Created session count correct", 0, mgr.getCreatedSessionCount());
+ assertEquals("Expired session count correct", 0, mgr.getExpiredSessionCount());
+ assertEquals("Passivated session count correct", 0, mgr.getPassivatedSessionCount());
+
+ // Sleep past minIdleTime
+ SessionTestUtil.sleepThread(1100);
+
+ createAndUseSession(mgr, "4", true, true);
+ }
+
+ public void testReplicatedRedeploy() throws Exception
+ {
+ log.info("Enter testReplicatedRedeploy");
+
+ replicatedWarRedeployTest(false);
+ }
+
+ public void testReplicatedRestart() throws Exception
+ {
+ log.info("Enter testReplicatedRestart");
+
+ replicatedWarRedeployTest(true);
+
+ }
+
+ private void replicatedWarRedeployTest(boolean fullRestart)
+ throws Exception
+ {
+ ++testCount;
+ DataSourcePersistentManager mgr0 = PersistentSessionTestUtil.createManager("test" + testCount, 300, null);
+ PersistentSessionTestUtil.configureManager(mgr0, 1, true, 30, 1);
+
+ mgr0.start();
+
+ assertTrue("Passivation is enabled", mgr0.isPassivationEnabled());
+ assertEquals("Correct max active count", 1, mgr0.getMaxActiveAllowed());
+ assertEquals("Correct max idle time", 30, mgr0.getPassivationMaxIdleTime());
+ assertEquals("Correct min idle time", 1, mgr0.getPassivationMinIdleTime());
+
+ DataSourcePersistentManager mgr1 = PersistentSessionTestUtil.createManager("test" + testCount, 300, null);
+ PersistentSessionTestUtil.configureManager(mgr1, 1, true, 30, 1);
+
+ mgr1.start();
+
+ assertTrue("Passivation is enabled", mgr1.isPassivationEnabled());
+ assertEquals("Correct max active count", 1, mgr1.getMaxActiveAllowed());
+ assertEquals("Correct max idle time", 30, mgr1.getPassivationMaxIdleTime());
+ assertEquals("Correct min idle time", 1, mgr1.getPassivationMinIdleTime());
+
+ // Set up a session
+ createAndUseSession(mgr0, "1", true, true);
+
+ assertEquals("Session count correct", 1, mgr0.getActiveSessionCount());
+ assertEquals("Local session count correct", 1, mgr0.getLocalActiveSessionCount());
+ assertEquals("Session count correct", 0, mgr1.getActiveSessionCount());
+ assertEquals("Local session count correct", 0, mgr1.getLocalActiveSessionCount());
+
+ // Create a 2nd
+ createAndUseSession(mgr1, "2", true, true);
+
+ assertEquals("Session count correct", 1, mgr0.getActiveSessionCount());
+ assertEquals("Local session count correct", 1, mgr0.getLocalActiveSessionCount());
+ assertEquals("Created session count correct", 1, mgr0.getCreatedSessionCount());
+ assertEquals("Expired session count correct", 0, mgr0.getExpiredSessionCount());
+ assertEquals("Session count correct", 1, mgr1.getActiveSessionCount());
+ assertEquals("Local session count correct", 1, mgr1.getLocalActiveSessionCount());
+ assertEquals("Created session count correct", 1, mgr1.getCreatedSessionCount());
+ assertEquals("Expired session count correct", 0, mgr1.getExpiredSessionCount());
+
+ // Sleep past minIdleTime
+ SessionTestUtil.sleepThread(1100);
+
+ assertEquals("Passivated session count correct", 0, mgr1.getPassivatedSessionCount());
+
+ createAndUseSession(mgr1, "3", true, true);
+
+ assertEquals("Session count correct", 1, mgr0.getActiveSessionCount());
+ assertEquals("Local session count correct", 1, mgr0.getLocalActiveSessionCount());
+ assertEquals("Created session count correct", 1, mgr0.getCreatedSessionCount());
+ assertEquals("Expired session count correct", 0, mgr0.getExpiredSessionCount());
+ assertEquals("Passivated session count correct", 0, mgr0.getPassivatedSessionCount());
+ // mgr1 only has 1 active since it passivated one when it created #3
+ assertEquals("Session count correct", 1, mgr1.getActiveSessionCount());
+ assertEquals("Local session count correct", 1, mgr1.getLocalActiveSessionCount());
+ assertEquals("Created session count correct", 2, mgr1.getCreatedSessionCount());
+ assertEquals("Expired session count correct", 0, mgr1.getExpiredSessionCount());
+ assertEquals("Passivated session count correct", 1, mgr1.getPassivatedSessionCount());
+
+ if (fullRestart)
+ {
+ mgr1.stop();
+ }
+
+ mgr0.stop();
+
+ mgr0 = PersistentSessionTestUtil.createManager("test" + testCount, 300, null);
+ PersistentSessionTestUtil.configureManager(mgr0, 1, true, 30, 1);
+
+ mgr0.start();
+
+ assertTrue("Passivation is enabled", mgr0.isPassivationEnabled());
+ assertEquals("Correct max active count", 1, mgr0.getMaxActiveAllowed());
+ assertEquals("Correct max idle time", 30, mgr0.getPassivationMaxIdleTime());
+ assertEquals("Correct min idle time", 1, mgr0.getPassivationMinIdleTime());
+
+// int expected = (totalReplication && marshalling && fullRestart) ? 0 : 2;
+ int expected = 2;
+ assertEquals("Session count correct", 0, mgr0.getActiveSessionCount());
+ assertEquals("Local session count correct", 0, mgr0.getLocalActiveSessionCount());
+ assertEquals("Created session count correct", 0, mgr0.getCreatedSessionCount());
+ assertEquals("Expired session count correct", 0, mgr0.getExpiredSessionCount());
+// expected = (totalReplication && !(marshalling && fullRestart)) ? 1 : 0;
+ expected = 1;
+ assertEquals("Passivated session count correct", 0, mgr0.getPassivatedSessionCount());
+
+ if (!fullRestart)
+ {
+ assertEquals("Session count correct", 1, mgr1.getActiveSessionCount());
+ assertEquals("Local session count correct", 1, mgr1.getLocalActiveSessionCount());
+ assertEquals("Created session count correct", 2, mgr1.getCreatedSessionCount());
+ assertEquals("Expired session count correct", 0, mgr1.getExpiredSessionCount());
+ assertEquals("Passivated session count correct", 1, mgr1.getPassivatedSessionCount());
+ }
+ // Sleep past minIdleTime
+ SessionTestUtil.sleepThread(1100);
+
+ createAndUseSession(mgr0, "4", true, true);
+ }
+
+ private Session createAndUseSession(DataSourcePersistentManager dspm, String id,
+ boolean canCreate, boolean access)
+ throws Exception
+ {
+ // Shift to Manager interface when we simulate Tomcat
+ Manager mgr = dspm;
+ Session sess = mgr.findSession(id);
+ assertNull("session does not exist", sess);
+ try
+ {
+ sess = mgr.createSession(id);
+ if (!canCreate)
+ fail("Could not create session" + id);
+ }
+ catch (IllegalStateException ise)
+ {
+ if (canCreate)
+ {
+ log.error("Failed to create session " + id, ise);
+ fail("Could create session " + id);
+ }
+ }
+
+ if (access)
+ {
+ sess.access();
+ sess.getSession().setAttribute("test", "test");
+
+ dspm.storeSession(sess);
+
+ sess.endAccess();
+ }
+
+ return sess;
+ }
+
+ private Session useSession(DataSourcePersistentManager dspm, String id)
+ throws Exception
+ {
+ // Shift to Manager interface when we simulate Tomcat
+ Manager mgr = dspm;
+ Session sess = mgr.findSession(id);
+ assertNotNull("session exists", sess);
+
+ sess.access();
+ sess.getSession().setAttribute("test", "test");
+
+ dspm.storeSession(sess);
+
+ sess.endAccess();
+
+ return sess;
+ }
+}
Copied: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/PersistentStoreSessionNotificationPolicyTestCase.java (from rev 91184, branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/PersistentStoreSessionNotificationPolicyTestCase.java)
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/PersistentStoreSessionNotificationPolicyTestCase.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/PersistentStoreSessionNotificationPolicyTestCase.java 2009-07-14 15:00:09 UTC (rev 91219)
@@ -0,0 +1,701 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.cluster.defaultcfg.simpleweb.test;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import junit.framework.Test;
+
+import org.apache.catalina.Context;
+import org.jboss.logging.Logger;
+import org.jboss.metadata.web.jboss.ReplicationGranularity;
+import org.jboss.metadata.web.jboss.ReplicationTrigger;
+import org.jboss.test.JBossTestCase;
+import org.jboss.test.cluster.testutil.SessionTestUtil;
+import org.jboss.test.cluster.web.mocks.BasicRequestHandler;
+import org.jboss.test.cluster.web.mocks.InvalidateSessionRequestHandler;
+import org.jboss.test.cluster.web.mocks.RemoveAttributesRequestHandler;
+import org.jboss.test.cluster.web.mocks.SetAttributesRequestHandler;
+import org.jboss.test.cluster.web.notification.MockClusteredSessionNotificationPolicy;
+import org.jboss.test.cluster.web.notification.MockHttpSessionAttributeListener;
+import org.jboss.test.cluster.web.notification.MockHttpSessionListener;
+import org.jboss.test.cluster.web.notification.SessionSpecListenerAttribute;
+import org.jboss.test.cluster.web.persistent.PersistentSessionTestUtil;
+import org.jboss.test.cluster.web.persistent.SimplePersistentStoreTestSetup;
+import org.jboss.web.tomcat.service.session.persistent.DataSourcePersistentManager;
+
+/**
+ * Tests of handling of servlet spec notifications.
+ *
+ * @author Brian Stansberry
+ */
+public class PersistentStoreSessionNotificationPolicyTestCase extends JBossTestCase
+{
+ protected static long testId = System.currentTimeMillis();
+
+ protected Logger log = Logger.getLogger(getClass());
+
+ protected Set<DataSourcePersistentManager> managers = new HashSet<DataSourcePersistentManager>();
+
+ protected Map<String, Object> allAttributes;
+ protected Map<String, Object> immutables;
+ protected Map<String, Object> mutables;
+ protected Map<String, Object> attributes;
+ protected SessionSpecListenerAttribute attribute = new SessionSpecListenerAttribute();
+ protected Map<String, Object> newAttributes;
+ protected SessionSpecListenerAttribute newAttribute = new SessionSpecListenerAttribute();
+
+ protected String origNotificationPolicy;
+
+ public PersistentStoreSessionNotificationPolicyTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite() throws Exception
+ {
+ return SimplePersistentStoreTestSetup.getDeploySetup(PersistentStoreSessionNotificationPolicyTestCase.class);
+ }
+
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ origNotificationPolicy = System.getProperty("jboss.web.clustered.session.notification.policy");
+ System.setProperty("jboss.web.clustered.session.notification.policy", MockClusteredSessionNotificationPolicy.class.getName());
+
+ attributes = new HashMap<String, Object>();
+ attributes.put("KEY", attribute);
+ attributes = Collections.unmodifiableMap(attributes);
+
+ newAttributes = new HashMap<String, Object>();
+ newAttributes.put("KEY", newAttribute);
+ newAttributes = Collections.unmodifiableMap(newAttributes);
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+
+ if (origNotificationPolicy != null)
+ {
+ System.setProperty("jboss.web.clustered.session.notification.policy", origNotificationPolicy);
+ }
+ else
+ {
+ System.clearProperty("jboss.web.clustered.session.notification.policy");
+ }
+
+ for (DataSourcePersistentManager manager : managers)
+ {
+ try
+ {
+ manager.stop();
+ }
+ catch (RuntimeException ignored)
+ {
+ log.debug("tearDown(): Caught exception cleaning up manager -- " + ignored.getLocalizedMessage());
+ }
+ }
+ managers.clear();
+
+ SessionSpecListenerAttribute.invocations.clear();
+ }
+
+ protected ReplicationGranularity getReplicationGranularity()
+ {
+ return ReplicationGranularity.SESSION;
+ }
+
+ protected ReplicationTrigger getReplicationTrigger()
+ {
+ return ReplicationTrigger.SET_AND_NON_PRIMITIVE_GET;
+ }
+
+ public void testSessionLifecycleWithNotifications() throws Exception
+ {
+ log.info("++++ Starting testSessionLifecycleWithNotifications ++++");
+ sessionLifecycleTest(true);
+ }
+
+ public void testSessionLifecycleWithoutNotifications() throws Exception
+ {
+ log.info("++++ Starting testSessionLifecycleWithoutNotifications ++++");
+ sessionLifecycleTest(false);
+ }
+
+ private void sessionLifecycleTest(boolean notify) throws Exception
+ {
+ String warname = String.valueOf(++testId);
+
+ // A war with a maxInactive of 30 mins maxUnreplicated of 0
+ DataSourcePersistentManager[] mgrs = getCacheManagers(warname, 1800, 1);
+ DataSourcePersistentManager mgr0 = mgrs[0];
+ DataSourcePersistentManager mgr1 = mgrs[1];
+
+ assertTrue(mgr0.getNotificationPolicy() instanceof MockClusteredSessionNotificationPolicy);
+ MockClusteredSessionNotificationPolicy mcsnp0 = (MockClusteredSessionNotificationPolicy) mgr0.getNotificationPolicy();
+ assertNotNull("capability set", mcsnp0.getClusteredSessionNotificationCapability());
+ mcsnp0.setResponse(notify);
+
+ assertTrue(mgr1.getNotificationPolicy() instanceof MockClusteredSessionNotificationPolicy);
+ MockClusteredSessionNotificationPolicy mcsnp1 = (MockClusteredSessionNotificationPolicy) mgr1.getNotificationPolicy();
+ assertNotNull("capability set", mcsnp1.getClusteredSessionNotificationCapability());
+ mcsnp1.setResponse(notify);
+
+ MockHttpSessionListener hsl0 = new MockHttpSessionListener();
+ MockHttpSessionAttributeListener hsal0 = new MockHttpSessionAttributeListener();
+ Context ctx = (Context) mgr0.getContainer();
+ ctx.setApplicationLifecycleListeners(new Object[]{ hsl0 });
+ ctx.setApplicationEventListeners(new Object[]{ hsal0 });
+
+ MockHttpSessionListener hsl1 = new MockHttpSessionListener();
+ MockHttpSessionAttributeListener hsal1 = new MockHttpSessionAttributeListener();
+ ctx = (Context) mgr1.getContainer();
+ ctx.setApplicationLifecycleListeners(new Object[]{ hsl1 });
+ ctx.setApplicationEventListeners(new Object[]{ hsal1 });
+
+ // Initial request
+ SetAttributesRequestHandler setHandler = new SetAttributesRequestHandler(attributes, false);
+ SessionTestUtil.invokeRequest(mgr0, setHandler, null);
+
+ validateNewSession(setHandler);
+ String sessionId = setHandler.getSessionId();
+
+ if (!notify)
+ {
+ validateNoNotifications(hsl0, hsal0, hsl1, hsal1);
+ }
+ else
+ {
+ assertEquals(1, hsl0.invocations.size());
+ assertEquals(MockHttpSessionListener.Type.CREATED, hsl0.invocations.get(0));
+ assertEquals(1, hsal0.invocations.size());
+ assertEquals(MockHttpSessionAttributeListener.Type.ADDED, hsal0.invocations.get(0));
+ assertEquals(2, SessionSpecListenerAttribute.invocations.size());
+ assertEquals(SessionSpecListenerAttribute.Type.BOUND, SessionSpecListenerAttribute.invocations.get(0));
+ assertEquals(SessionSpecListenerAttribute.Type.PASSIVATED, SessionSpecListenerAttribute.invocations.get(1));
+
+ validateNoNotifications(null, null, hsl1, hsal1, null);
+ clearNotifications(hsl0, hsal0, null, null, SessionSpecListenerAttribute.invocations);
+ }
+
+ // Modify attribute request
+ setHandler = new SetAttributesRequestHandler(newAttributes, false);
+ SessionTestUtil.invokeRequest(mgr0, setHandler, sessionId);
+
+ if (!notify)
+ {
+ validateNoNotifications(hsl0, hsal0, hsl1, hsal1);
+ }
+ else
+ {
+ assertEquals(1, hsal0.invocations.size());
+ assertEquals(MockHttpSessionAttributeListener.Type.REPLACED, hsal0.invocations.get(0));
+ assertEquals(4, SessionSpecListenerAttribute.invocations.size());
+ assertEquals(SessionSpecListenerAttribute.Type.ACTIVATING, SessionSpecListenerAttribute.invocations.get(0));
+ assertEquals(SessionSpecListenerAttribute.Type.BOUND, SessionSpecListenerAttribute.invocations.get(1));
+ assertEquals(SessionSpecListenerAttribute.Type.UNBOUND, SessionSpecListenerAttribute.invocations.get(2));
+ assertEquals(SessionSpecListenerAttribute.Type.PASSIVATED, SessionSpecListenerAttribute.invocations.get(3));
+
+ validateNoNotifications(hsl0, null, hsl1, hsal1, null);
+ clearNotifications(null, hsal0, null, null, SessionSpecListenerAttribute.invocations);
+ }
+
+ // Passivate
+ Thread.sleep(1100);
+
+ mgr0.backgroundProcess();
+ mgr1.backgroundProcess();
+
+ if (!notify)
+ {
+ validateNoNotifications(hsl0, hsal0, hsl1, hsal1);
+ }
+ else
+ {
+ assertEquals(1, SessionSpecListenerAttribute.invocations.size());
+ assertEquals(SessionSpecListenerAttribute.Type.PASSIVATED, SessionSpecListenerAttribute.invocations.get(0));
+
+ validateNoNotifications(hsl0, hsal0, hsl1, hsal1, null);
+ clearNotifications(null, null, null, null, SessionSpecListenerAttribute.invocations);
+ }
+
+ // Remove attribute request
+ RemoveAttributesRequestHandler removeHandler = new RemoveAttributesRequestHandler(newAttributes.keySet(), false);
+ SessionTestUtil.invokeRequest(mgr0, removeHandler, sessionId);
+
+ if (!notify)
+ {
+ validateNoNotifications(hsl0, hsal0, hsl1, hsal1);
+ }
+ else
+ {
+ assertEquals(1, hsal0.invocations.size());
+ assertEquals(MockHttpSessionAttributeListener.Type.REMOVED, hsal0.invocations.get(0));
+ assertEquals(3, SessionSpecListenerAttribute.invocations.size());
+ assertEquals(SessionSpecListenerAttribute.Type.ACTIVATING, SessionSpecListenerAttribute.invocations.get(0));
+ assertEquals(SessionSpecListenerAttribute.Type.ACTIVATING, SessionSpecListenerAttribute.invocations.get(1));
+ assertEquals(SessionSpecListenerAttribute.Type.UNBOUND, SessionSpecListenerAttribute.invocations.get(2));
+
+ validateNoNotifications(hsl0, null, hsl1, hsal1, null);
+ clearNotifications(null, hsal0, null, null, SessionSpecListenerAttribute.invocations);
+ }
+
+ // Failover request
+ setHandler = new SetAttributesRequestHandler(attributes, false);
+ SessionTestUtil.invokeRequest(mgr1, setHandler, sessionId);
+
+ if (!notify)
+ {
+ validateNoNotifications(hsl0, hsal0, hsl1, hsal1);
+ }
+ else
+ {
+ assertEquals(1, hsl1.invocations.size());
+ assertEquals(MockHttpSessionListener.Type.CREATED, hsl1.invocations.get(0));
+ assertEquals(1, hsal1.invocations.size());
+ assertEquals(MockHttpSessionAttributeListener.Type.ADDED, hsal1.invocations.get(0));
+ assertEquals(2, SessionSpecListenerAttribute.invocations.size());
+ assertEquals(SessionSpecListenerAttribute.Type.BOUND, SessionSpecListenerAttribute.invocations.get(0));
+ assertEquals(SessionSpecListenerAttribute.Type.PASSIVATED, SessionSpecListenerAttribute.invocations.get(1));
+
+ validateNoNotifications(hsl0, hsal0, null, null, null);
+ clearNotifications(null, null, hsl1, hsal1, SessionSpecListenerAttribute.invocations);
+ }
+
+ // Passivate
+ Thread.sleep(1100);
+
+ mgr0.backgroundProcess();
+ mgr1.backgroundProcess();
+
+ if (!notify)
+ {
+ validateNoNotifications(hsl0, hsal0, hsl1, hsal1);
+ }
+ else
+ {
+ assertEquals(1, SessionSpecListenerAttribute.invocations.size());
+ assertEquals(SessionSpecListenerAttribute.Type.PASSIVATED, SessionSpecListenerAttribute.invocations.get(0));
+
+ validateNoNotifications(hsl0, hsal0, hsl1, hsal1, null);
+ clearNotifications(null, null, null, null, SessionSpecListenerAttribute.invocations);
+ }
+
+ // Fail back and invalidate session after changing attribute
+ InvalidateSessionRequestHandler invalidateHandler = new InvalidateSessionRequestHandler(newAttributes.keySet(), false);
+ SessionTestUtil.invokeRequest(mgr0, invalidateHandler, sessionId);
+
+ if (!notify)
+ {
+ validateNoNotifications(hsl0, hsal0, hsl1, hsal1);
+ }
+ else
+ {
+ assertEquals(1, hsl0.invocations.size());
+ assertEquals(MockHttpSessionListener.Type.DESTROYED, hsl0.invocations.get(0));
+ assertEquals(1, hsal0.invocations.size());
+ assertEquals(MockHttpSessionAttributeListener.Type.REMOVED, hsal0.invocations.get(0));
+ assertEquals(3, SessionSpecListenerAttribute.invocations.size());
+ assertEquals(SessionSpecListenerAttribute.Type.ACTIVATING, SessionSpecListenerAttribute.invocations.get(0));
+ assertEquals(SessionSpecListenerAttribute.Type.ACTIVATING, SessionSpecListenerAttribute.invocations.get(1));
+ assertEquals(SessionSpecListenerAttribute.Type.UNBOUND, SessionSpecListenerAttribute.invocations.get(2));
+
+ validateNoNotifications(null, null, hsl1, hsal1, null);
+ clearNotifications(hsl0, hsal0, null, null, SessionSpecListenerAttribute.invocations);
+ }
+ }
+
+ public void testSessionExpirationWithNotifications() throws Exception
+ {
+ log.info("++++ Starting testSessionExpirationWithNotifications ++++");
+ sessionExpirationTest(true);
+ }
+
+ public void testSessionExpirationWithoutNotifications() throws Exception
+ {
+ log.info("++++ Starting testSessionExpirationWithoutNotifications ++++");
+ sessionExpirationTest(false);
+ }
+
+ private void sessionExpirationTest(boolean notify) throws Exception
+ {
+ String warname = String.valueOf(++testId);
+
+ // A war with a maxInactive of 2 secs and a maxIdle of 1
+ DataSourcePersistentManager[] mgrs = getCacheManagers(warname, 2, 1);
+ DataSourcePersistentManager mgr0 = mgrs[0];
+ DataSourcePersistentManager mgr1 = mgrs[1];
+
+ assertTrue(mgr0.getNotificationPolicy() instanceof MockClusteredSessionNotificationPolicy);
+ MockClusteredSessionNotificationPolicy mcsnp0 = (MockClusteredSessionNotificationPolicy) mgr0.getNotificationPolicy();
+ assertNotNull("capability set", mcsnp0.getClusteredSessionNotificationCapability());
+ mcsnp0.setResponse(notify);
+
+ assertTrue(mgr1.getNotificationPolicy() instanceof MockClusteredSessionNotificationPolicy);
+ MockClusteredSessionNotificationPolicy mcsnp1 = (MockClusteredSessionNotificationPolicy) mgr1.getNotificationPolicy();
+ assertNotNull("capability set", mcsnp1.getClusteredSessionNotificationCapability());
+ mcsnp1.setResponse(notify);
+
+ MockHttpSessionListener hsl0 = new MockHttpSessionListener();
+ MockHttpSessionAttributeListener hsal0 = new MockHttpSessionAttributeListener();
+ Context ctx = (Context) mgr0.getContainer();
+ ctx.setApplicationLifecycleListeners(new Object[]{ hsl0 });
+ ctx.setApplicationEventListeners(new Object[]{ hsal0 });
+
+ MockHttpSessionListener hsl1 = new MockHttpSessionListener();
+ MockHttpSessionAttributeListener hsal1 = new MockHttpSessionAttributeListener();
+ ctx = (Context) mgr1.getContainer();
+ ctx.setApplicationLifecycleListeners(new Object[]{ hsl1 });
+ ctx.setApplicationEventListeners(new Object[]{ hsal1 });
+
+ // Initial request
+ SetAttributesRequestHandler setHandler = new SetAttributesRequestHandler(attributes, false);
+ SessionTestUtil.invokeRequest(mgr0, setHandler, null);
+
+ validateNewSession(setHandler);
+
+ String sessionId = setHandler.getSessionId();
+
+ if (!notify)
+ {
+ validateNoNotifications(hsl0, hsal0, hsl1, hsal1);
+ }
+ else
+ {
+ assertEquals(1, hsl0.invocations.size());
+ assertEquals(MockHttpSessionListener.Type.CREATED, hsl0.invocations.get(0));
+ assertEquals(1, hsal0.invocations.size());
+ assertEquals(MockHttpSessionAttributeListener.Type.ADDED, hsal0.invocations.get(0));
+ assertEquals(2, SessionSpecListenerAttribute.invocations.size());
+ assertEquals(SessionSpecListenerAttribute.Type.BOUND, SessionSpecListenerAttribute.invocations.get(0));
+ assertEquals(SessionSpecListenerAttribute.Type.PASSIVATED, SessionSpecListenerAttribute.invocations.get(1));
+
+ validateNoNotifications(null, null, hsl1, hsal1, null);
+ clearNotifications(hsl0, hsal0, null, null, SessionSpecListenerAttribute.invocations);
+ }
+
+ // Failover request
+ setHandler = new SetAttributesRequestHandler(newAttributes, false);
+ SessionTestUtil.invokeRequest(mgr1, setHandler, sessionId);
+
+ if (!notify)
+ {
+ validateNoNotifications(hsl0, hsal0, hsl1, hsal1);
+ }
+ else
+ {
+ assertEquals(1, hsl1.invocations.size());
+ assertEquals(MockHttpSessionListener.Type.CREATED, hsl1.invocations.get(0));
+ assertEquals(1, hsal1.invocations.size());
+ assertEquals(MockHttpSessionAttributeListener.Type.REPLACED, hsal1.invocations.get(0));
+ assertEquals(4, SessionSpecListenerAttribute.invocations.size());
+ assertEquals(SessionSpecListenerAttribute.Type.ACTIVATING, SessionSpecListenerAttribute.invocations.get(0));
+ assertEquals(SessionSpecListenerAttribute.Type.BOUND, SessionSpecListenerAttribute.invocations.get(1));
+ assertEquals(SessionSpecListenerAttribute.Type.UNBOUND, SessionSpecListenerAttribute.invocations.get(2));
+ assertEquals(SessionSpecListenerAttribute.Type.PASSIVATED, SessionSpecListenerAttribute.invocations.get(3));
+
+ validateNoNotifications(hsl0, hsal0, null, null, null);
+ clearNotifications(null, null, hsl1, hsal1, SessionSpecListenerAttribute.invocations);
+ }
+
+ // Passivate
+ Thread.sleep(1100);
+
+ log.info("passivating mgr0");
+ mgr0.backgroundProcess();
+ log.info("passivating mgr1");
+ mgr1.backgroundProcess();
+
+ if (!notify)
+ {
+ validateNoNotifications(hsl0, hsal0, hsl1, hsal1);
+ }
+ else
+ {
+ assertEquals(2, SessionSpecListenerAttribute.invocations.size());
+ assertEquals(SessionSpecListenerAttribute.Type.PASSIVATED, SessionSpecListenerAttribute.invocations.get(0));
+ assertEquals(SessionSpecListenerAttribute.Type.PASSIVATED, SessionSpecListenerAttribute.invocations.get(1));
+
+ validateNoNotifications(hsl0, hsal0, hsl1, hsal1, null);
+ clearNotifications(null, null, null, null, SessionSpecListenerAttribute.invocations);
+ }
+
+ // Expire
+ Thread.sleep(1000);
+
+ log.info("expiring mgr0");
+ mgr0.backgroundProcess();
+ log.info("expiring mgr1");
+ mgr1.backgroundProcess();
+
+ if (!notify)
+ {
+ validateNoNotifications(hsl0, hsal0, hsl1, hsal1);
+ }
+ else
+ {
+ // With a persistent manager we don't expect invocations from
+ // mgr1. When mgr0 invalidates the session, it is gone from the
+ // DB, which prevents mgr1 "activating" it to issue notifications.
+ assertEquals(1, hsl0.invocations.size());
+ assertEquals(MockHttpSessionListener.Type.DESTROYED, hsl0.invocations.get(0));
+ assertEquals(0, hsl1.invocations.size());
+// assertEquals(1, hsl1.invocations.size());
+// assertEquals(MockHttpSessionListener.Type.DESTROYED, hsl1.invocations.get(0));
+ assertEquals(1, hsal0.invocations.size());
+ assertEquals(MockHttpSessionAttributeListener.Type.REMOVED, hsal0.invocations.get(0));
+ assertEquals(0, hsal1.invocations.size());
+// assertEquals(1, hsal1.invocations.size());
+// assertEquals(MockHttpSessionAttributeListener.Type.REMOVED, hsal1.invocations.get(0));
+// assertEquals(4, SessionSpecListenerAttribute.invocations.size());
+ assertEquals(2, SessionSpecListenerAttribute.invocations.size());
+ assertEquals(SessionSpecListenerAttribute.Type.ACTIVATING, SessionSpecListenerAttribute.invocations.get(0));
+ assertEquals(SessionSpecListenerAttribute.Type.UNBOUND, SessionSpecListenerAttribute.invocations.get(1));
+// assertEquals(SessionSpecListenerAttribute.Type.ACTIVATING, SessionSpecListenerAttribute.invocations.get(2));
+// assertEquals(SessionSpecListenerAttribute.Type.UNBOUND, SessionSpecListenerAttribute.invocations.get(3));
+
+ validateNoNotifications(null, null, null, null, null);
+ clearNotifications(hsl0, hsal0, hsl1, hsal1, SessionSpecListenerAttribute.invocations);
+ }
+ }
+
+ public void testUndeployWithNotifications() throws Exception
+ {
+ log.info("++++ Starting testUndeployWithNotifications ++++");
+ undeployTest(true);
+ }
+
+ public void testUndeployWithoutNotifications() throws Exception
+ {
+ log.info("++++ Starting testUndeployWithoutNotifications ++++");
+ undeployTest(false);
+ }
+
+ private void undeployTest(boolean notify) throws Exception
+ {
+ String warname = String.valueOf(++testId);
+
+ // A war with a maxInactive of 30 mins and no maxIdle
+ DataSourcePersistentManager[] mgrs = getCacheManagers(warname, 1800, -1);
+ DataSourcePersistentManager mgr0 = mgrs[0];
+ DataSourcePersistentManager mgr1 = mgrs[1];
+
+ assertTrue(mgr0.getNotificationPolicy() instanceof MockClusteredSessionNotificationPolicy);
+ MockClusteredSessionNotificationPolicy mcsnp0 = (MockClusteredSessionNotificationPolicy) mgr0.getNotificationPolicy();
+ assertNotNull("capability set", mcsnp0.getClusteredSessionNotificationCapability());
+ mcsnp0.setResponse(notify);
+
+ assertTrue(mgr1.getNotificationPolicy() instanceof MockClusteredSessionNotificationPolicy);
+ MockClusteredSessionNotificationPolicy mcsnp1 = (MockClusteredSessionNotificationPolicy) mgr1.getNotificationPolicy();
+ assertNotNull("capability set", mcsnp1.getClusteredSessionNotificationCapability());
+ mcsnp1.setResponse(notify);
+
+ MockHttpSessionListener hsl0 = new MockHttpSessionListener();
+ MockHttpSessionAttributeListener hsal0 = new MockHttpSessionAttributeListener();
+ Context ctx = (Context) mgr0.getContainer();
+ ctx.setApplicationLifecycleListeners(new Object[]{ hsl0 });
+ ctx.setApplicationEventListeners(new Object[]{ hsal0 });
+
+ MockHttpSessionListener hsl1 = new MockHttpSessionListener();
+ MockHttpSessionAttributeListener hsal1 = new MockHttpSessionAttributeListener();
+ ctx = (Context) mgr1.getContainer();
+ ctx.setApplicationLifecycleListeners(new Object[]{ hsl1 });
+ ctx.setApplicationEventListeners(new Object[]{ hsal1 });
+
+ // Initial request
+ SetAttributesRequestHandler setHandler = new SetAttributesRequestHandler(attributes, false);
+ SessionTestUtil.invokeRequest(mgr0, setHandler, null);
+
+ validateNewSession(setHandler);
+
+ if (!notify)
+ {
+ validateNoNotifications(hsl0, hsal0, hsl1, hsal1);
+ }
+ else
+ {
+ assertEquals(1, hsl0.invocations.size());
+ assertEquals(MockHttpSessionListener.Type.CREATED, hsl0.invocations.get(0));
+ assertEquals(1, hsal0.invocations.size());
+ assertEquals(MockHttpSessionAttributeListener.Type.ADDED, hsal0.invocations.get(0));
+ assertEquals(2, SessionSpecListenerAttribute.invocations.size());
+ assertEquals(SessionSpecListenerAttribute.Type.BOUND, SessionSpecListenerAttribute.invocations.get(0));
+ assertEquals(SessionSpecListenerAttribute.Type.PASSIVATED, SessionSpecListenerAttribute.invocations.get(1));
+
+ validateNoNotifications(null, null, hsl1, hsal1, null);
+ clearNotifications(hsl0, hsal0, null, null, SessionSpecListenerAttribute.invocations);
+
+ }
+
+ mgr0.stop();
+
+ if (!notify)
+ {
+ validateNoNotifications(hsl0, hsal0, hsl1, hsal1);
+ }
+ else
+ {
+ assertEquals(1, hsl0.invocations.size());
+ assertEquals(MockHttpSessionListener.Type.DESTROYED, hsl0.invocations.get(0));
+ assertEquals(1, hsal0.invocations.size());
+ assertEquals(MockHttpSessionAttributeListener.Type.REMOVED, hsal0.invocations.get(0));
+ assertEquals(1, SessionSpecListenerAttribute.invocations.size());
+ assertEquals(SessionSpecListenerAttribute.Type.UNBOUND, SessionSpecListenerAttribute.invocations.get(0));
+
+ validateNoNotifications(null, null, hsl1, hsal1, null);
+ clearNotifications(hsl0, hsal0, null, null, SessionSpecListenerAttribute.invocations);
+
+
+ }
+
+ mgr1.stop();
+
+ if (!notify)
+ {
+ validateNoNotifications(hsl0, hsal0, hsl1, hsal1);
+ }
+ else
+ {
+ validateNoNotifications(hsl0, hsal0, hsl1, hsal1);
+ }
+ }
+
+ private void validateNoNotifications(MockHttpSessionListener hsl0, MockHttpSessionAttributeListener hsal0,
+ MockHttpSessionListener hsl1, MockHttpSessionAttributeListener hsal1)
+ {
+ validateNoNotifications(hsl0, hsal0, hsl1, hsal1, SessionSpecListenerAttribute.invocations);
+ }
+
+ private void validateNoNotifications(MockHttpSessionListener hsl0, MockHttpSessionAttributeListener hsal0,
+ MockHttpSessionListener hsl1, MockHttpSessionAttributeListener hsal1, List<SessionSpecListenerAttribute.Type> sspalis)
+ {
+ if (hsl0 != null)
+ {
+ assertEquals(0, hsl0.invocations.size());
+ }
+ if (hsal0 != null)
+ {
+ assertEquals(0, hsal0.invocations.size());
+ }
+ if (hsl1 != null)
+ {
+ assertEquals(0, hsl1.invocations.size());
+ }
+ if (hsal1 != null)
+ {
+ assertEquals(0, hsal1.invocations.size());
+ }
+
+ if (sspalis != null)
+ {
+ assertEquals(0, sspalis.size());
+ }
+
+ clearNotifications(hsl0, hsal0, hsl1, hsal1, sspalis);
+ }
+
+ private void clearNotifications(MockHttpSessionListener hsl0, MockHttpSessionAttributeListener hsal0,
+ MockHttpSessionListener hsl1, MockHttpSessionAttributeListener hsal1, List<SessionSpecListenerAttribute.Type> sspalis)
+ {
+
+ if (hsl0 != null)
+ {
+ hsl0.invocations.clear();
+ }
+ if (hsal0 != null)
+ {
+ hsal0.invocations.clear();
+ }
+ if (hsl1 != null)
+ {
+ hsl1.invocations.clear();
+ }
+ if (hsal1 != null)
+ {
+ hsal1.invocations.clear();
+ }
+
+ if (sspalis != null)
+ {
+ sspalis.clear();
+ }
+ }
+
+ protected DataSourcePersistentManager[] getCacheManagers(String warname, int maxInactive, int maxIdle)
+ throws Exception
+ {
+ DataSourcePersistentManager mgr0 = PersistentSessionTestUtil.createManager(warname, maxInactive, null);
+ PersistentSessionTestUtil.configureManager(mgr0, getReplicationGranularity(), getReplicationTrigger(), -1, maxIdle > 0, maxIdle, -1 ,false, 0);
+ mgr0.setSessionNotificationPolicyClass(MockClusteredSessionNotificationPolicy.class.getName());
+ this.managers.add(mgr0);
+ mgr0.start();
+
+ DataSourcePersistentManager mgr1 = PersistentSessionTestUtil.createManager(warname, maxInactive, null);
+ PersistentSessionTestUtil.configureManager(mgr1, getReplicationGranularity(), getReplicationTrigger(), -1, true, maxIdle, -1 ,false, 0);
+ mgr1.setSessionNotificationPolicyClass(MockClusteredSessionNotificationPolicy.class.getName());
+ this.managers.add(mgr1);
+ mgr1.start();
+
+ return new DataSourcePersistentManager[]{mgr0, mgr1};
+ }
+
+ protected void validateExpectedAttributes(Map<String, Object> expected, BasicRequestHandler handler)
+ {
+ assertFalse(handler.isNewSession());
+
+ if (handler.isCheckAttributeNames())
+ {
+ assertEquals(expected.size(), handler.getAttributeNames().size());
+ }
+ Map<String, Object> checked = handler.getCheckedAttributes();
+ assertEquals(expected.size(), checked.size());
+ for (Map.Entry<String, Object> entry : checked.entrySet())
+ assertEquals(entry.getKey(), expected.get(entry.getKey()), entry.getValue());
+
+ }
+
+ protected void validateNewSession(BasicRequestHandler handler)
+ {
+ assertTrue(handler.isNewSession());
+ assertEquals(handler.getCreationTime(), handler.getLastAccessedTime());
+ if (handler.isCheckAttributeNames())
+ {
+ assertEquals(0, handler.getAttributeNames().size());
+ }
+ Map<String, Object> checked = handler.getCheckedAttributes();
+ for (Map.Entry<String, Object> entry : checked.entrySet())
+ assertNull(entry.getKey(), entry.getValue());
+ }
+
+
+}
Copied: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/PersistentManagerCrossContextCallsTestCase.java (from rev 91184, branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/PersistentManagerCrossContextCallsTestCase.java)
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/PersistentManagerCrossContextCallsTestCase.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/PersistentManagerCrossContextCallsTestCase.java 2009-07-14 15:00:09 UTC (rev 91219)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.cluster.defaultcfg.web.test;
+
+import java.util.Arrays;
+import java.util.List;
+
+import junit.framework.Test;
+
+import org.jboss.test.cluster.testutil.DBSetupDelegate;
+import org.jboss.test.cluster.testutil.TestSetupDelegate;
+import org.jboss.test.cluster.web.JBossClusteredWebTestCase;
+import org.jboss.test.cluster.web.persistent.PersistentStoreSetupDelegate;
+
+public class PersistentManagerCrossContextCallsTestCase extends CrossContextCallsTestCase
+{
+
+ public PersistentManagerCrossContextCallsTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite() throws Exception
+ {
+ TestSetupDelegate dbDelegate = new DBSetupDelegate();
+ TestSetupDelegate storeDelegate = new PersistentStoreSetupDelegate();
+ List<TestSetupDelegate> list = Arrays.asList(new TestSetupDelegate[]{dbDelegate, storeDelegate});
+ return JBossClusteredWebTestCase.getDeploySetup(PersistentManagerCrossContextCallsTestCase.class,
+ "disable-manager-override.beans, httpsession-ds.xml, " +
+ "http-cross-ctx-persistent.ear", list);
+ }
+}
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/testutil/DBSetup.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/testutil/DBSetup.java 2009-07-14 14:54:17 UTC (rev 91218)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/testutil/DBSetup.java 2009-07-14 15:00:09 UTC (rev 91219)
@@ -21,18 +21,11 @@
*/
package org.jboss.test.cluster.testutil;
-import java.sql.DriverManager;
-import java.sql.Connection;
-import java.sql.Statement;
-import java.io.File;
-import java.io.IOException;
-
-import org.jboss.test.JBossTestClusteredSetup;
-
-import junit.extensions.TestSetup;
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.jboss.test.JBossTestClusteredSetup;
+
/** A TestSetup that starts hypersonic before the testcase with a tcp
* listening port at 1701.
*
@@ -41,9 +34,12 @@
*/
public class DBSetup extends JBossTestClusteredSetup
{
+ private final TestSetupDelegate delegate;
+
public DBSetup(Test test, String jarNames) throws Exception
{
super(test, jarNames);
+ this.delegate = new DBSetupDelegate();
}
public static Test getDeploySetup(final Test test, final String jarNames)
@@ -52,7 +48,7 @@
return new DBSetup(test, jarNames);
}
- public static Test getDeploySetup(final Class clazz, final String jarNames)
+ public static Test getDeploySetup(final Class<?> clazz, final String jarNames)
throws Exception
{
TestSuite suite = new TestSuite();
@@ -62,40 +58,8 @@
protected void setUp() throws Exception
{
- File hypersoniDir = new File("output/hypersonic");
- if (!hypersoniDir.exists())
- {
- hypersoniDir.mkdirs();
- }
-
- if (!hypersoniDir.isDirectory())
- {
- throw new IOException("Failed to create directory: " + hypersoniDir);
- }
-
- File dbPath = new File(hypersoniDir, "cif-db");
-
- // Start DB in new thread, or else it will block us
- DBThread serverThread = new DBThread(dbPath);
- serverThread.start();
+ delegate.setUp();
- int elapsed = 0;
- while (!serverThread.isStarted() && elapsed < 15000)
- {
- try
- {
- Thread.sleep(100);
- elapsed += 100;
- }
- catch (InterruptedException ie)
- {
- System.out.println("Interrupted while waiting for Hypersonic");
- }
- }
-
- if (!serverThread.isStarted())
- System.out.println("Hypersonic failed to start in a timely fashion");
-
super.setUp();
}
@@ -107,11 +71,7 @@
}
finally
{
- Class.forName("org.hsqldb.jdbcDriver");
- String dbURL = "jdbc:hsqldb:hsql://localhost:1701";
- Connection conn = DriverManager.getConnection(dbURL, "sa", "");
- Statement statement = conn.createStatement();
- statement.executeQuery("SHUTDOWN COMPACT");
+ delegate.tearDown();
}
}
@@ -123,54 +83,4 @@
Thread.sleep(120*1000);
setup.tearDown();
}
-
- class DBThread extends Thread
- {
- boolean started;
- File dbPath;
-
- DBThread(File dbPath)
- {
- super("hypersonic");
- this.dbPath = dbPath;
- }
-
- boolean isStarted()
- {
- return started;
- }
-
- public void run()
- {
- try
- {
- // Create startup arguments
- // BES 2007/09/25 We use -silent true to avoid
- // http://sourceforge.net/tracker/index.php?func=detail&aid=1673747&group_id=23316&atid=378131
- String[] args = {
- "-database",
- dbPath.toString(),
- "-port",
- String.valueOf(1701),
- "-silent",
- "true",
- "-trace",
- "false",
- "-no_system_exit",
- "true",
- };
- System.out.println("Starting hsqldb");
- org.hsqldb.Server.main(args);
- System.out.println("Done");
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- finally
- {
- started = true;
- }
- }
- }
}
Copied: trunk/testsuite/src/main/org/jboss/test/cluster/testutil/DBSetupDelegate.java (from rev 91184, branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/cluster/testutil/DBSetupDelegate.java)
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/testutil/DBSetupDelegate.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/testutil/DBSetupDelegate.java 2009-07-14 15:00:09 UTC (rev 91219)
@@ -0,0 +1,147 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.cluster.testutil;
+
+import java.io.File;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.Statement;
+
+import org.jboss.test.JBossTestServices;
+
+/** A TestSetup that starts hypersonic before the testcase with a tcp
+ * listening port at 1701.
+ *
+ * @author Brian Stansberry
+ * @version $Revison:$
+ */
+public class DBSetupDelegate implements TestSetupDelegate
+{
+ public void setTestServices(JBossTestServices services)
+ {
+ // no-op
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.test.cluster.testutil.TestSetupDelegate#setUp()
+ */
+ public void setUp() throws Exception
+ {
+ File hypersoniDir = new File("output/hypersonic");
+ if (!hypersoniDir.exists())
+ {
+ hypersoniDir.mkdirs();
+ }
+
+ if (!hypersoniDir.isDirectory())
+ {
+ throw new IOException("Failed to create directory: " + hypersoniDir);
+ }
+
+ File dbPath = new File(hypersoniDir, "cif-db");
+
+ // Start DB in new thread, or else it will block us
+ DBThread serverThread = new DBThread(dbPath);
+ serverThread.start();
+
+ int elapsed = 0;
+ while (!serverThread.isStarted() && elapsed < 15000)
+ {
+ try
+ {
+ Thread.sleep(100);
+ elapsed += 100;
+ }
+ catch (InterruptedException ie)
+ {
+ System.out.println("Interrupted while waiting for Hypersonic");
+ }
+ }
+
+ if (!serverThread.isStarted())
+ System.out.println("Hypersonic failed to start in a timely fashion");
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.test.cluster.testutil.TestSetupDelegate#tearDown()
+ */
+ public void tearDown() throws Exception
+ {
+ Class.forName("org.hsqldb.jdbcDriver");
+ String dbURL = "jdbc:hsqldb:hsql://localhost:1701";
+ Connection conn = DriverManager.getConnection(dbURL, "sa", "");
+ Statement statement = conn.createStatement();
+ statement.executeQuery("SHUTDOWN COMPACT");
+ }
+
+ class DBThread extends Thread
+ {
+ boolean started;
+ File dbPath;
+
+ DBThread(File dbPath)
+ {
+ super("hypersonic");
+ this.dbPath = dbPath;
+ }
+
+ boolean isStarted()
+ {
+ return started;
+ }
+
+ public void run()
+ {
+ try
+ {
+ // Create startup arguments
+ // BES 2007/09/25 We use -silent true to avoid
+ // http://sourceforge.net/tracker/index.php?func=detail&aid=1673747&group_id=23316&atid=378131
+ String[] args = {
+ "-database",
+ dbPath.toString(),
+ "-port",
+ String.valueOf(1701),
+ "-silent",
+ "true",
+ "-trace",
+ "false",
+ "-no_system_exit",
+ "true",
+ };
+ System.out.println("Starting hsqldb");
+ org.hsqldb.Server.main(args);
+ System.out.println("Done");
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ finally
+ {
+ started = true;
+ }
+ }
+ }
+
+}
Copied: trunk/testsuite/src/main/org/jboss/test/cluster/testutil/DelegatingClusteredTestCase.java (from rev 91184, branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/cluster/testutil/DelegatingClusteredTestCase.java)
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/testutil/DelegatingClusteredTestCase.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/testutil/DelegatingClusteredTestCase.java 2009-07-14 15:00:09 UTC (rev 91219)
@@ -0,0 +1,178 @@
+/**
+ *
+ */
+package org.jboss.test.cluster.testutil;
+
+import java.util.List;
+import java.util.ListIterator;
+import java.util.StringTokenizer;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.jboss.test.AbstractTestSetup;
+import org.jboss.test.JBossClusteredTestCase;
+import org.jboss.test.JBossTestCase;
+import org.jboss.test.JBossTestClusteredSetup;
+import org.jboss.test.JBossTestServices;
+
+/**
+ * JBossClusteredTestCase extension that accepts a list of
+ * {@link TestSetupDelegate} that can be processed as part of setup/tearDown of
+ * the suite.
+ *
+ * @author Brian Stansberry
+ *
+ * @version $Revision: $
+ */
+public class DelegatingClusteredTestCase extends JBossClusteredTestCase
+{
+ /**
+ * @param name
+ */
+ public DelegatingClusteredTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test getDeploySetup(Test test, String jarNames)
+ throws Exception
+ {
+ return getDeploySetup(test, jarNames, null);
+ }
+
+ public static Test getDeploySetup(Class<?> clazz, String jarNames)
+ throws Exception
+ {
+ return getDeploySetup(clazz, jarNames, null);
+ }
+
+ public static Test getDeploySetup(Test test, String jarNames, List<TestSetupDelegate> delegates)
+ throws Exception
+ {
+ return new DelegatingTestSetup(test, jarNames, delegates);
+ }
+
+ public static Test getDeploySetup(Class<?> clazz, String jarNames, List<TestSetupDelegate> delegates)
+ throws Exception
+ {
+ TestSuite suite = new TestSuite();
+ suite.addTest(new TestSuite(clazz));
+ return getDeploySetup(suite, jarNames, delegates);
+ }
+
+ public static class DelegatingTestSetup extends JBossTestClusteredSetup
+ {
+ private final List<TestSetupDelegate> setupDelegates;
+ private String jarNames = null;
+
+ /**
+ * @param test
+ * @throws Exception
+ */
+ public DelegatingTestSetup(Test test, String jarNames, List<TestSetupDelegate> delegates) throws Exception
+ {
+ super(test, jarNames);
+ this.jarNames = jarNames;
+ this.setupDelegates = delegates;
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ JBossTestServices services = this.delegate;
+ if (setupDelegates != null)
+ {
+ for (TestSetupDelegate setupDelegate : setupDelegates)
+ {
+ setupDelegate.setTestServices(services);
+ setupDelegate.setUp();
+ }
+ }
+
+ deployJars();
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ try
+ {
+ undeployJars();
+ }
+ finally
+ {
+ try
+ {
+ if (setupDelegates != null)
+ {
+ for (ListIterator<TestSetupDelegate> it = setupDelegates.listIterator(); it.hasPrevious(); )
+ {
+ TestSetupDelegate setupDelegate = it.previous();
+ setupDelegate.tearDown();
+ }
+ }
+ }
+ finally
+ {
+
+ try
+ {
+ super.tearDown();
+ }
+ finally
+ {
+ AbstractTestSetup.delegate = null;
+ }
+ }
+ }
+ }
+
+ private void deployJars() throws Exception
+ {
+ JBossTestCase.deploymentException = null;
+ try
+ {
+ // deploy the comma seperated list of jars
+ StringTokenizer st = new StringTokenizer(jarNames, ", ");
+ while (st.hasMoreTokens())
+ {
+ String jarName = st.nextToken();
+ this.redeploy(jarName);
+ this.getLog().debug("deployed package: " + jarName);
+ }
+ }
+ catch (Exception ex)
+ {
+ // Throw this in testServerFound() instead.
+ JBossTestCase.deploymentException = ex;
+ }
+
+ // wait a couple seconds to let the cluster stabilize
+ synchronized (this)
+ {
+ wait(2000);
+ }
+ }
+
+ private void undeployJars() throws Exception
+ {
+ // deploy the comma seperated list of jars
+ StringTokenizer st = new StringTokenizer(jarNames, ", ");
+ String[] depoyments = new String[st.countTokens()];
+ for (int i = depoyments.length - 1; i >= 0; i--)
+ depoyments[i] = st.nextToken();
+ for (int i = 0; i < depoyments.length; i++)
+ {
+ String jarName = depoyments[i];
+ this.getLog().debug("Attempt undeploy of " + jarName);
+ this.undeploy(jarName);
+ this.getLog().debug("undeployed package: " + jarName);
+ }
+ }
+
+ }
+
+}
Copied: trunk/testsuite/src/main/org/jboss/test/cluster/testutil/TestSetupDelegate.java (from rev 91184, branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/cluster/testutil/TestSetupDelegate.java)
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/testutil/TestSetupDelegate.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/testutil/TestSetupDelegate.java 2009-07-14 15:00:09 UTC (rev 91219)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.cluster.testutil;
+
+import org.jboss.test.JBossTestServices;
+
+import junit.extensions.TestSetup;
+
+/**
+ * Class to which a {@link TestSetup} can delegate some or all of its
+ * setUp or tearDown work.
+ *
+ *
+ * @author Brian Stansberry
+ *
+ * @version $Revision: $
+ */
+public interface TestSetupDelegate
+{
+ /**
+ * Provides the delegate with a reference to the JBossTestServices.
+ * Delegate can assume this will be invoked before setUp().
+ */
+ void setTestServices(JBossTestServices services);
+
+ /** Perform setUp work. */
+ void setUp() throws Exception;
+ /** Perform tearDown work. */
+ void tearDown() throws Exception;
+
+}
\ No newline at end of file
Copied: trunk/testsuite/src/main/org/jboss/test/cluster/web/JBossCacheConfigTestSetupDelegate.java (from rev 91184, branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/cluster/web/JBossCacheConfigTestSetupDelegate.java)
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/web/JBossCacheConfigTestSetupDelegate.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/web/JBossCacheConfigTestSetupDelegate.java 2009-07-14 15:00:09 UTC (rev 91219)
@@ -0,0 +1,92 @@
+/**
+ *
+ */
+package org.jboss.test.cluster.web;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+
+import org.jboss.logging.Logger;
+import org.jboss.test.JBossTestClusteredServices;
+import org.jboss.test.JBossTestServices;
+import org.jboss.test.cluster.testutil.TestSetupDelegate;
+
+/**
+ *
+ *
+ * @author Brian Stansberry
+ *
+ * @version $Revision: $
+ */
+public class JBossCacheConfigTestSetupDelegate implements TestSetupDelegate
+{
+ public static final String SYSTEM_PROPS_SVC = "jboss:type=Service,name=SystemProperties";
+
+ private static final Logger log = Logger.getLogger(JBossCacheConfigTestSetupDelegate.class);
+
+ private String cacheConfigName;
+ private String usePojoCache;
+ private JBossTestClusteredServices clusteredServices;
+
+ public void setTestServices(JBossTestServices services)
+ {
+ this.clusteredServices = (JBossTestClusteredServices) services;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.test.cluster.testutil.TestSetupDelegate#setUp()
+ */
+ public void setUp() throws Exception
+ {
+
+ cacheConfigName = System.getProperty(CacheHelper.CACHE_CONFIG_PROP);
+ usePojoCache = System.getProperty(CacheHelper.CACHE_TYPE_PROP, "false");
+ if (cacheConfigName != null || Boolean.parseBoolean(usePojoCache))
+ {
+ setServerSideCacheConfigProperties();
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.test.cluster.testutil.TestSetupDelegate#tearDown()
+ */
+ public void tearDown() throws Exception
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ private void setServerSideCacheConfigProperties() throws Exception
+ {
+ log.debug("configuring server with cacheConfigName=" + cacheConfigName + " and usePojoCache=" + usePojoCache);
+
+ ObjectName on = new ObjectName(SYSTEM_PROPS_SVC);
+ for (MBeanServerConnection adaptor : clusteredServices.getAdaptors())
+ {
+ adaptor.invoke(on, "set",
+ new Object[]{CacheHelper.CACHE_CONFIG_PROP, cacheConfigName},
+ new String[] {String.class.getName(), String.class.getName()});
+
+ adaptor.invoke(on, "set",
+ new Object[]{CacheHelper.CACHE_TYPE_PROP, usePojoCache},
+ new String[] {String.class.getName(), String.class.getName()});
+ }
+ }
+
+ private void clearServerSideCacheConfigProperties() throws Exception
+ {
+ ObjectName on = new ObjectName(SYSTEM_PROPS_SVC);
+ for (MBeanServerConnection adaptor : clusteredServices.getAdaptors())
+ {
+ adaptor.invoke(on, "remove",
+ new Object[]{CacheHelper.CACHE_CONFIG_PROP},
+ new String[] {String.class.getName()});
+
+ adaptor.invoke(on, "remove",
+ new Object[] {CacheHelper.CACHE_TYPE_PROP},
+ new String[] {String.class.getName()});
+ }
+ }
+
+
+}
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/web/JBossClusteredWebTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/web/JBossClusteredWebTestCase.java 2009-07-14 14:54:17 UTC (rev 91218)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/web/JBossClusteredWebTestCase.java 2009-07-14 15:00:09 UTC (rev 91219)
@@ -22,29 +22,25 @@
package org.jboss.test.cluster.web;
-import java.util.StringTokenizer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.jboss.test.AbstractTestDelegate;
-import org.jboss.test.AbstractTestSetup;
-import org.jboss.test.JBossClusteredTestCase;
-import org.jboss.test.JBossTestCase;
import org.jboss.test.JBossTestClusteredServices;
-import org.jboss.test.JBossTestSetup;
+import org.jboss.test.cluster.testutil.DelegatingClusteredTestCase;
+import org.jboss.test.cluster.testutil.TestSetupDelegate;
/**
* @author Brian Stansberry
*
*/
-public class JBossClusteredWebTestCase extends JBossClusteredTestCase
+public class JBossClusteredWebTestCase extends DelegatingClusteredTestCase
{
- public static AbstractTestDelegate getDelegate(Class clazz)
+ public static AbstractTestDelegate getDelegate(Class<?> clazz)
throws Exception
{
return new JBossTestClusteredServices(clazz);
@@ -63,160 +59,63 @@
public static Test getDeploySetup(Test test, String jarNames)
throws Exception
{
- return new JBossClusteredWebTestSetup(test, jarNames);
+ return getDeploySetup(test, jarNames, null);
}
- public static Test getDeploySetup(Class clazz, String jarNames)
+ public static Test getDeploySetup(Class<?> clazz, String jarNames)
throws Exception
{
- TestSuite suite = new TestSuite();
- suite.addTest(new TestSuite(clazz));
- return getDeploySetup(suite, jarNames);
+ return getDeploySetup(clazz, jarNames, null);
}
-
- private static String getJarNamesWithHelper(String jarNames)
+
+ public static Test getDeploySetup(Test test, String jarNames, List<TestSetupDelegate> delegates)
+ throws Exception
{
- if (jarNames == null || jarNames.length() == 0)
- return "jbosscache-helper.sar";
- else
- return "jbosscache-helper.sar, " + jarNames;
+ return DelegatingClusteredTestCase.getDeploySetup(test, getJarNamesWithHelper(jarNames), ensureJBCConfigDelegate(delegates));
}
+
+ public static Test getDeploySetup(Class<?> clazz, String jarNames, List<TestSetupDelegate> delegates)
+ throws Exception
+ {
+ return DelegatingClusteredTestCase.getDeploySetup(clazz, getJarNamesWithHelper(jarNames), ensureJBCConfigDelegate(delegates));
+ }
- public static class JBossClusteredWebTestSetup extends JBossTestSetup
+ private static List<TestSetupDelegate> ensureJBCConfigDelegate(List<TestSetupDelegate> delegates)
{
- public static final String SYSTEM_PROPS_SVC = "jboss:type=Service,name=SystemProperties";
-
- private String cacheConfigName;
- private String usePojoCache;
- private String jarNames = null;
- private JBossTestClusteredServices clusteredServices;
-
- /**
- * Create a new JBossTestClusteredWebSetup.
- *
- * @param test
- * @param jarNames
- * @throws Exception
- */
- public JBossClusteredWebTestSetup(Test test, String jarNames) throws Exception
+ List<TestSetupDelegate> result = delegates;
+ if (result == null)
{
- super(JBossClusteredWebTestCase.class, test);
- this.jarNames = getJarNamesWithHelper(jarNames);
+ result = Arrays.asList(new TestSetupDelegate[]{new JBossCacheConfigTestSetupDelegate()});
}
-
- @Override
- protected void setUp() throws Exception
- {
- super.setUp();
-
- getLog().debug("delegate is " + delegate);
-
- clusteredServices = (JBossTestClusteredServices) delegate;
-
- cacheConfigName = System.getProperty(CacheHelper.CACHE_CONFIG_PROP);
- usePojoCache = System.getProperty(CacheHelper.CACHE_TYPE_PROP, "false");
- if (cacheConfigName != null || Boolean.parseBoolean(usePojoCache))
- {
- setServerSideCacheConfigProperties();
- }
-
- deployJars();
- }
-
- @Override
- protected void tearDown() throws Exception
+ else
{
- try
+ boolean hasJBCConfig = false;
+ for (TestSetupDelegate setup : delegates)
{
- undeployJars();
-
- super.tearDown();
- if (cacheConfigName != null)
+ if (setup instanceof JBossCacheConfigTestSetupDelegate)
{
- clearServerSideCacheConfigProperties();
+ hasJBCConfig = true;
+ break;
}
}
- finally
- {
- AbstractTestSetup.delegate = null;
- }
- }
-
- private void setServerSideCacheConfigProperties() throws Exception
- {
- getLog().debug("configuring server with cacheConfigName=" + cacheConfigName + " and usePojoCache=" + usePojoCache);
- ObjectName on = new ObjectName(SYSTEM_PROPS_SVC);
- for (MBeanServerConnection adaptor : clusteredServices.getAdaptors())
+ if (!hasJBCConfig)
{
- adaptor.invoke(on, "set",
- new Object[]{CacheHelper.CACHE_CONFIG_PROP, cacheConfigName},
- new String[] {String.class.getName(), String.class.getName()});
-
- adaptor.invoke(on, "set",
- new Object[]{CacheHelper.CACHE_TYPE_PROP, usePojoCache},
- new String[] {String.class.getName(), String.class.getName()});
- }
- }
-
- private void clearServerSideCacheConfigProperties() throws Exception
- {
- ObjectName on = new ObjectName(SYSTEM_PROPS_SVC);
- for (MBeanServerConnection adaptor : clusteredServices.getAdaptors())
- {
- adaptor.invoke(on, "remove",
- new Object[]{CacheHelper.CACHE_CONFIG_PROP},
- new String[] {String.class.getName()});
-
- adaptor.invoke(on, "remove",
- new Object[] {CacheHelper.CACHE_TYPE_PROP},
- new String[] {String.class.getName()});
- }
- }
-
- private void deployJars() throws Exception
- {
- JBossTestCase.deploymentException = null;
- try
- {
- // deploy the comma seperated list of jars
- StringTokenizer st = new StringTokenizer(jarNames, ", ");
- while (st.hasMoreTokens())
- {
- String jarName = st.nextToken();
- this.redeploy(jarName);
- this.getLog().debug("deployed package: " + jarName);
- }
+ result = new ArrayList<TestSetupDelegate>(delegates);
+ result.add(0, new JBossCacheConfigTestSetupDelegate());
}
- catch (Exception ex)
- {
- // Throw this in testServerFound() instead.
- JBossTestCase.deploymentException = ex;
- }
-
- // wait a couple seconds to let the cluster stabilize
- synchronized (this)
- {
- wait(2000);
- }
}
- private void undeployJars() throws Exception
- {
- // deploy the comma seperated list of jars
- StringTokenizer st = new StringTokenizer(jarNames, ", ");
- String[] depoyments = new String[st.countTokens()];
- for (int i = depoyments.length - 1; i >= 0; i--)
- depoyments[i] = st.nextToken();
- for (int i = 0; i < depoyments.length; i++)
- {
- String jarName = depoyments[i];
- this.getLog().debug("Attempt undeploy of " + jarName);
- this.undeploy(jarName);
- this.getLog().debug("undeployed package: " + jarName);
- }
- }
+ return result;
+ }
+
+ private static String getJarNamesWithHelper(String jarNames)
+ {
+ if (jarNames == null || jarNames.length() == 0)
+ return "jbosscache-helper.sar";
+ else
+ return "jbosscache-helper.sar, " + jarNames;
}
}
Copied: trunk/testsuite/src/main/org/jboss/test/cluster/web/persistent (from rev 91184, branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/cluster/web/persistent)
Copied: trunk/testsuite/src/resources/cluster/persistent (from rev 91184, branches/JBPAPP_5_0/testsuite/src/resources/cluster/persistent)
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/DeployerConfig.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/DeployerConfig.java 2009-07-14 14:54:17 UTC (rev 91218)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/DeployerConfig.java 2009-07-14 15:00:09 UTC (rev 91219)
@@ -119,6 +119,8 @@
/** FQN of the SecurityContext Class */
private String securityContextClassName;
+
+ private boolean overrideDistributableManager = true;
public ClassLoader getServiceClassLoader()
{
@@ -311,4 +313,40 @@
{
this.sharedMetaData = sharedMetaData;
}
+
+ /**
+ * Gets whether the session <code>Manager</code> implementation for
+ * distributable webapps should be overridden with an instance of
+ * {@link #getManagerClass()}.
+ * <p>
+ * Setting this to <code>false</code> allows custom configuration of
+ * a manager via a <code>context.xml</code>. Default is <code>true</code>.
+ * </p>
+ *
+ * @return <code>true</code> if the manager should be overridden,
+ * <code>false</code> if the existing manager should be retained.
+ */
+ public boolean getOverrideDistributableManager()
+ {
+ return overrideDistributableManager;
+ }
+
+ /**
+ * Sets whether the session <code>Manager</code> implementation for
+ * distributable webapps should be overridden with an instance of
+ * {@link #getManagerClass()}.
+ * <p>
+ * Setting this to <code>false</code> allows custom configuration of
+ * a manager via a <code>context.xml</code>. Default is <code>true</code>.
+ * </p>
+ *
+ * @param override <code>true</code> if the manager should be overridden,
+ * <code>false</code> if the existing manager should be retained.
+ */
+ public void setOverrideDistributableManager(boolean override)
+ {
+ this.overrideDistributableManager = override;
+ }
+
+
}
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java 2009-07-14 14:54:17 UTC (rev 91218)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java 2009-07-14 15:00:09 UTC (rev 91219)
@@ -90,6 +90,9 @@
* to true.
*/
protected String managerClass = "org.jboss.web.tomcat.service.session.JBossCacheManager";
+
+ /** Whether to override the Manager impl for distributable webapps */
+ private boolean overrideDistributableManager = true;
/**
* A flag indicating if the JBoss Loader should be used
@@ -169,6 +172,40 @@
this.managerClass = managerClass;
}
+ /**
+ * Gets whether the session <code>Manager</code> implementation for
+ * distributable webapps should be overridden with an instance of
+ * {@link #getManagerClass()}.
+ * <p>
+ * Setting this to <code>false</code> allows custom configuration of
+ * a manager via a <code>context.xml</code>. Default is <code>true</code>.
+ * </p>
+ *
+ * @return <code>true</code> if the manager should be overridden,
+ * <code>false</code> if the existing manager should be retained.
+ */
+ public boolean getOverrideDistributableManager()
+ {
+ return this.overrideDistributableManager;
+ }
+
+ /**
+ * Sets whether the session <code>Manager</code> implementation for
+ * distributable webapps should be overridden with an instance of
+ * {@link #getManagerClass()}.
+ * <p>
+ * Setting this to <code>false</code> allows custom configuration of
+ * a manager via a <code>context.xml</code>. Default is <code>true</code>.
+ * </p>
+ *
+ * @param override <code>true</code> if the manager should be overridden,
+ * <code>false</code> if the existing manager should be retained.
+ */
+ public void setOverrideDistributableManager(boolean override)
+ {
+ this.overrideDistributableManager = override;
+ }
+
public ClassLoader getServiceClassLoader()
{
return serviceClassLoader;
@@ -406,7 +443,7 @@
*
* @param unit - the current web app deployment unit
* @param metaData - the parsed metdata for the web app deployment
- * @return TomcatDeployment instnace
+ * @return TomcatDeployment instance
*/
@Override
public AbstractWarDeployment getDeployment(DeploymentUnit unit, JBossWebMetaData metaData) throws Exception
@@ -424,6 +461,7 @@
? getClass().getClassLoader()
: getServiceClassLoader());
config.setManagerClass(this.managerClass);
+ config.setOverrideDistributableManager(this.overrideDistributableManager);
config.setJava2ClassLoadingCompliance(this.java2ClassLoadingCompliance);
config.setUnpackWars(this.unpackWars);
config.setLenientEjbLink(this.lenientEjbLink);
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java 2009-07-14 14:54:17 UTC (rev 91218)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java 2009-07-14 15:00:09 UTC (rev 91219)
@@ -332,7 +332,7 @@
}
// Clustering
- if (metaData.getDistributable() != null)
+ if (config.getOverrideDistributableManager() && metaData.getDistributable() != null)
{
// Try to initate clustering, fallback to standard if no clustering is
// available
Copied: trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/AskSessionOutdatedSessionChecker.java (from rev 91184, branches/JBPAPP_5_0/tomcat/src/main/org/jboss/web/tomcat/service/session/AskSessionOutdatedSessionChecker.java)
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/AskSessionOutdatedSessionChecker.java (rev 0)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/AskSessionOutdatedSessionChecker.java 2009-07-14 15:00:09 UTC (rev 91219)
@@ -0,0 +1,23 @@
+/**
+ *
+ */
+package org.jboss.web.tomcat.service.session;
+
+import org.jboss.web.tomcat.service.session.distributedcache.spi.OutgoingDistributableSessionData;
+
+/**
+ *
+ *
+ * @author Brian Stansberry
+ *
+ * @version $Revision: $
+ */
+public class AskSessionOutdatedSessionChecker
+ implements OutdatedSessionChecker
+{
+ public boolean isSessionOutdated(ClusteredSession<? extends OutgoingDistributableSessionData> session)
+ {
+ return session.isOutdated();
+ }
+
+}
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java 2009-07-14 14:54:17 UTC (rev 91218)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java 2009-07-14 15:00:09 UTC (rev 91219)
@@ -89,7 +89,7 @@
private static final String info_ = "JBossCacheManager/1.0";
private static final int TOTAL_PERMITS = Integer.MAX_VALUE;
-
+
// ------------------------------------------------------------------ Fields
/** The transaction manager. */
@@ -155,6 +155,8 @@
private Semaphore semaphore = new Semaphore(TOTAL_PERMITS, true);
private Lock valveLock = new SemaphoreLock(this.semaphore);
+ private OutdatedSessionChecker outdatedSessionChecker;
+
// ---------------------------------------------------------- Constructors
public JBossCacheManager() throws ClusteringNotSupportedException
@@ -222,7 +224,7 @@
// Initing the proxy would be better in start, but we do it here so we
// can detect ClusteringNotSupportedException at this deploy stage
- initCacheProxy();
+ initDistributedCacheManager();
embedded_ = true;
}
@@ -495,13 +497,21 @@
// session.tellNew(ClusteredSessionNotificationCause.FAILOVER);
// }
}
- else if (session != null && session.isOutdated())
+ else if (session != null && this.outdatedSessionChecker.isSessionOutdated(session))
{
if (trace_)
log_.trace("Updating session " + realId + " from the distributed cache");
// Need to update it from the cache
- loadSession(realId);
+ session = loadSession(realId);
+ if (session == null)
+ {
+ // We have a session locally but it's no longer available
+ // from the distributed store; i.e. it's been invalidated elsewhere
+ // So we need to clean up
+ // TODO what about notifications?
+ this.sessions_.remove(realId);
+ }
}
if (session != null)
@@ -609,8 +619,8 @@
// ------------------------------------------------------- ClusteredManager
/**
- * Gets the <code>JBossCacheService</code> through which we interact
- * with the <code>Cache</code>.
+ * Gets the <code>DistributedCacheManager</code> through which we interact
+ * with the distributed store.
*/
public DistributedCacheManager<O> getDistributedCacheManager()
{
@@ -713,6 +723,9 @@
backgroundProcessAllowed.set(false);
}
+ // Let subclasses clean up
+ stopExtensions();
+
resetStats();
// Notify our interested LifecycleListeners
@@ -844,22 +857,6 @@
/**
* {@inheritDoc}
*/
- public long getPassivationMaxIdleTime()
- {
- return passivationMaxIdleTime_;
- }
-
- /**
- * {@inheritDoc}
- */
- public long getPassivationMinIdleTime()
- {
- return passivationMinIdleTime_;
- }
-
- /**
- * {@inheritDoc}
- */
public ReplicationGranularity getReplicationGranularity()
{
return replicationGranularity_;
@@ -992,7 +989,7 @@
// Ensure the correct TCL is in place
// BES 2008/11/27 Why?
- ContextClassLoaderSwitcher.SwitchContext switcher = null;
+ ContextClassLoaderSwitcher.SwitchContext switcher = null;
try
{
// Don't track this invalidation is if it were from a request
@@ -1129,6 +1126,12 @@
{
this.snapshotMode_ = snapshotMode;
}
+
+ public void setSnapshotMode(String snapshotMode)
+ {
+ snapshotMode = (snapshotMode == null ? null : snapshotMode.toUpperCase());
+ setSnapshotMode(SnapshotMode.fromString(snapshotMode));
+ }
/**
* Sets whether the <code>Engine</code> in which we are running
@@ -1214,9 +1217,260 @@
this.replicationFieldBatchMode_ = Boolean.valueOf(replicationFieldBatchMode);
}
- // --------------------------------------------------------------- Overrides
+ public String getSessionNotificationPolicyClass()
+ {
+ return notificationPolicyClass_;
+ }
+ public void setSessionNotificationPolicyClass(String notificationPolicyClass)
+ {
+ this.notificationPolicyClass_ = notificationPolicyClass;
+ }
+
+
+ // --------------------------------------------------------------- Protected
+
+
/**
+ * Accesses the underlying cache and creates the proxy
+ *
+ * @throws ClusteringNotSupportedException
+ */
+ protected void initDistributedCacheManager() throws ClusteringNotSupportedException
+ {
+ proxy_ = distributedCacheManagerFactory.getDistributedCacheManager(this);
+ }
+
+ /**
+ * Create and start a snapshot manager.
+ */
+ protected void initSnapshotManager()
+ {
+ String ctxPath = ((Context) container_).getPath();
+ if (SnapshotMode.INSTANT == snapshotMode_)
+ {
+ snapshotManager_ = new InstantSnapshotManager(this, ctxPath);
+ }
+ else if (snapshotMode_ == null)
+ {
+ log_.warn("Snapshot mode must be 'instant' or 'interval' - " +
+ "using 'instant'");
+ snapshotMode_ = SnapshotMode.INSTANT;
+ snapshotManager_ = new InstantSnapshotManager(this, ctxPath);
+ }
+ else if (ReplicationGranularity.FIELD == replicationGranularity_)
+ {
+ throw new IllegalStateException("Property snapshotMode must be " +
+ SnapshotMode.INTERVAL + " when FIELD granularity is used");
+ }
+ else if (snapshotInterval_ < 1)
+ {
+ log_.warn("Snapshot mode set to 'interval' but snapshotInterval is < 1 " +
+ "using 'instant'");
+ snapshotMode_ = SnapshotMode.INSTANT;
+ snapshotManager_ = new InstantSnapshotManager(this, ctxPath);
+ }
+ else
+ {
+ snapshotManager_ = new IntervalSnapshotManager(this, ctxPath, snapshotInterval_);
+ }
+
+ snapshotManager_.start();
+ }
+
+ protected SnapshotManager getSnapshotManager()
+ {
+ return snapshotManager_;
+ }
+
+ protected void setSnapshotManager(SnapshotManager manager)
+ {
+ this.snapshotManager_ = manager;
+ }
+
+ /**
+ * Instantiate a SnapshotManager and ClusteredSessionValve and add
+ * the valve to our parent Context's pipeline.
+ * Add a JvmRouteValve and BatchReplicationClusteredSessionValve if needed.
+ */
+ protected void installValves()
+ {
+ log_.debug("Adding LockingValve");
+ this.installContextValve(new LockingValve(this.valveLock));
+
+ // If JK usage wasn't explicitly configured, default to enabling
+ // it if jvmRoute is set on our containing Engine
+ if (useJK_ == null)
+ {
+ useJK_ = Boolean.valueOf(getJvmRoute() != null);
+ }
+
+ if (getUseJK())
+ {
+ log_.debug("We are using JK for load-balancing. Adding JvmRouteValve.");
+ this.installContextValve(new JvmRouteValve(this));
+ }
+
+ // Handle batch replication if needed.
+ // TODO -- should we add this even if not FIELD in case a cross-context
+ // call traverses a field-based webapp?
+ BatchingManager valveBM = null;
+ if (replicationGranularity_ == ReplicationGranularity.FIELD
+ && Boolean.TRUE.equals(replicationFieldBatchMode_))
+ {
+ valveBM = this.batchingManager;
+ log_.debug("Including transaction manager in ClusteredSessionValve to support batch replication.");
+ }
+
+ // Add clustered session valve
+ ClusteredSessionValve valve = new ClusteredSessionValve(this, valveBM);
+ log_.debug("Adding ClusteredSessionValve");
+ this.installContextValve(valve);
+ }
+
+ protected void initClusteredSessionNotificationPolicy()
+ {
+ if (this.notificationPolicyClass_ == null || this.notificationPolicyClass_.length() == 0)
+ {
+ this.notificationPolicyClass_ = AccessController.doPrivileged(new PrivilegedAction<String>()
+ {
+ public String run()
+ {
+ return System.getProperty("jboss.web.clustered.session.notification.policy",
+ IgnoreUndeployLegacyClusteredSessionNotificationPolicy.class.getName());
+ }
+ });
+ }
+
+ try
+ {
+ this.notificationPolicy_ = (ClusteredSessionNotificationPolicy) Thread.currentThread().getContextClassLoader().loadClass(this.notificationPolicyClass_).newInstance();
+ }
+ catch (RuntimeException e)
+ {
+ throw e;
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException("Failed to instantiate " +
+ ClusteredSessionNotificationPolicy.class.getName() +
+ " " + this.notificationPolicyClass_, e);
+ }
+
+ this.notificationPolicy_.setClusteredSessionNotificationCapability(new ClusteredSessionNotificationCapability());
+ }
+
+ protected OutdatedSessionChecker initOutdatedSessionChecker()
+ {
+ return new AskSessionOutdatedSessionChecker();
+ }
+
+ /**
+ * Gets the ids of all sessions in the distributed cache and adds
+ * them to the unloaded sessions map, along with their lastAccessedTime
+ * and their maxInactiveInterval. Passivates overage or excess sessions.
+ */
+ protected void initializeUnloadedSessions()
+ {
+ Map<String, String> sessions = proxy_.getSessionIds();
+ if (sessions != null)
+ {
+ boolean passivate = isPassivationEnabled();
+
+ long passivationMax = passivationMaxIdleTime_ * 1000L;
+ long passivationMin = passivationMinIdleTime_ * 1000L;
+
+ for (Map.Entry<String, String> entry : sessions.entrySet())
+ {
+ String realId = entry.getKey();
+ String owner = entry.getValue();
+
+ long ts = -1;
+ DistributableSessionMetadata md = null;
+ try
+ {
+ IncomingDistributableSessionData sessionData = proxy_.getSessionData(realId, owner, false);
+ ts = sessionData.getTimestamp();
+ md = sessionData.getMetadata();
+ }
+ catch (Exception e)
+ {
+ // most likely a lock conflict if the session is being updated remotely;
+ // ignore it and use default values for timstamp and maxInactive
+ log_.debug("Problem reading metadata for session " + realId + " -- " + e.toString());
+ }
+
+ long lastMod = ts == -1 ? System.currentTimeMillis() : ts;
+ int maxLife = md == null ? getMaxInactiveInterval() : md.getMaxInactiveInterval();
+
+ OwnedSessionUpdate osu = new OwnedSessionUpdate(owner, lastMod, maxLife, false);
+ unloadedSessions_.put(realId, osu);
+ if (passivate)
+ {
+ try
+ {
+ long elapsed = System.currentTimeMillis() - lastMod;
+ // if maxIdle time configured, means that we need to passivate sessions that have
+ // exceeded the max allowed idle time
+ if (passivationMax >= 0
+ && elapsed > passivationMax)
+ {
+ if (trace_)
+ {
+ log_.trace("Elapsed time of " + elapsed + " for session "+
+ realId + " exceeds max of " + passivationMax + "; passivating");
+ }
+ processUnloadedSessionPassivation(realId, osu);
+ }
+ // If the session didn't exceed the passivationMaxIdleTime_, see
+ // if the number of sessions managed by this manager greater than the max allowed
+ // active sessions, passivate the session if it exceed passivationMinIdleTime_
+ else if (maxActiveAllowed_ > 0
+ && passivationMin >= 0
+ && calcActiveSessions() > maxActiveAllowed_
+ && elapsed >= passivationMin)
+ {
+ if (trace_)
+ {
+ log_.trace("Elapsed time of " + elapsed + " for session "+
+ realId + " exceeds min of " + passivationMin + "; passivating");
+ }
+ processUnloadedSessionPassivation(realId, osu);
+ }
+ }
+ catch (Exception e)
+ {
+ // most likely a lock conflict if the session is being updated remotely; ignore it
+ log_.debug("Problem passivating session " + realId + " -- " + e.toString());
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Hook executed during {@link #start()} processing that allows subclasses
+ * to add extra processing to the startup. This is invoked at the end of
+ * the startup process, just before external request are free to access
+ * this manager. This default implementation does nothing.
+ */
+ protected void startExtensions()
+ {
+ // no-op
+ }
+
+ /**
+ * Hook executed during {@link #stop()} processing that allows subclasses
+ * to add extra processing to the shutdown. This is invoked at the beginning
+ * of the shutdown process, just after external requests to this manager are
+ * cut off. This default implementation does nothing.
+ */
+ protected void stopExtensions()
+ {
+ // no-op
+ }
+
+ /**
* {@inheritDoc}
* <p>
* Overrides the superclass version to ensure that the generated id
@@ -1296,7 +1550,7 @@
// JBAS-2403. Check for outdated sessions where we think
// the local copy has timed out. If found, refresh the
// session from the cache in case that might change the timeout
- if (session.isOutdated() && !(session.isValid(false)))
+ if (this.outdatedSessionChecker.isSessionOutdated(session) && !(session.isValid(false)))
{
// FIXME in AS 5 every time we get a notification from the distributed
// cache of an update, we get the latest timestamp. So
@@ -1343,20 +1597,20 @@
// and permanently losing part of its node structure in JBoss Cache.
long maxUnrep = maxUnreplicatedInterval_ < 0 ? 60 : maxUnreplicatedInterval_;
- Map<String, OwnedSessionUpdate> unloaded = new HashMap<String, OwnedSessionUpdate>(unloadedSessions_);
+ Map<String, OwnedSessionUpdate> unloaded = getUnloadedSessions();
for (Map.Entry<String, OwnedSessionUpdate> entry : unloaded.entrySet())
{
String realId = entry.getKey();
OwnedSessionUpdate osu = entry.getValue();
long now = System.currentTimeMillis();
- long elapsed = (now - osu.updateTime);
+ long elapsed = (now - osu.getUpdateTime());
try
{
- if (expire && osu.maxInactive >= 1 && elapsed >= (osu.maxInactive + maxUnrep) * 1000L)
+ if (expire && osu.getMaxInactive() >= 1 && elapsed >= (osu.getMaxInactive() + maxUnrep) * 1000L)
{
//if (osu.passivated && osu.owner == null)
- if (osu.passivated)
+ if (osu.isPassivated())
{
// Passivated session needs to be expired. A call to
// findSession will bring it out of passivation
@@ -1371,12 +1625,12 @@
// If we get here either !osu.passivated, or we don't own
// the session or the session couldn't be reactivated (invalidated by user).
// Either way, do a cleanup
- proxy_.removeSessionLocal(realId, osu.owner);
+ proxy_.removeSessionLocal(realId, osu.getOwner());
unloadedSessions_.remove(realId);
stats_.removeStats(realId);
}
- else if (passivate && !osu.passivated)
+ else if (passivate && !osu.isPassivated())
{
// we now have a valid session; store it so we can check later
// if we need to passivate it
@@ -1464,6 +1718,12 @@
// ------------------------------------------------------ Session Management
+ protected Map<String, OwnedSessionUpdate> getUnloadedSessions()
+ {
+ Map<String, OwnedSessionUpdate> unloaded = new HashMap<String, OwnedSessionUpdate>(unloadedSessions_);
+ return unloaded;
+ }
+
private ClusteredSession<? extends OutgoingDistributableSessionData> createEmptyClusteredSession()
{
@@ -1565,7 +1825,7 @@
session = createEmptyClusteredSession();
OwnedSessionUpdate osu = unloadedSessions_.get(realId);
- passivated = (osu != null && osu.passivated);
+ passivated = (osu != null && osu.isPassivated());
}
synchronized (session)
@@ -1789,8 +2049,8 @@
log_.trace("Passivating session with id: " + realId);
}
- proxy_.evictSession(realId, osu.owner);
- osu.passivated = true;
+ proxy_.evictSession(realId, osu.getOwner());
+ osu.setPassivated(true);
sessionPassivated();
}
@@ -1819,31 +2079,16 @@
return;
}
- log_.info("Manager is about to start");
+ log_.debug("Manager is about to start");
// Notify our interested LifecycleListeners
lifecycle_.fireLifecycleEvent(BEFORE_START_EVENT, this);
- if (snapshotMode_ == null)
- {
- // We were not instantiated by a JBossCacheCluster, so we need to
- // find one and let it configure our cluster-wide properties
- try
- {
- JBossCacheCluster cluster = (JBossCacheCluster) container_.getCluster();
- cluster.configureManager(this);
- }
- catch (ClassCastException e)
- {
- String msg = "Cluster is not an instance of JBossCacheCluster";
- log_.error(msg, e);
- throw new LifecycleException(msg, e);
- }
- }
+ configureUnembedded();
initClusteredSessionNotificationPolicy();
- // Create the JBossCacheService
+ // Create the DistributedCacheManager
try
{
if (replicationConfig_ == null)
@@ -1853,7 +2098,7 @@
if (proxy_ == null)
{
- initCacheProxy();
+ initDistributedCacheManager();
}
// We need to pass the classloader that is associated with this
@@ -1863,7 +2108,7 @@
}
catch (Throwable t)
{
- String str = "Problem starting JBossCacheService for Tomcat clustering";
+ String str = "Problem starting DistributedCacheManager for HttpSession clustering";
log_.error(str, t);
throw new LifecycleException(str, t);
}
@@ -1871,22 +2116,31 @@
batchingManager = proxy_.getBatchingManager();
if(batchingManager == null)
{
- throw new LifecycleException("JBossCacheManager.start(): Obtain null batchingManager");
+ throw new LifecycleException("start(): Obtained null batchingManager");
}
try
- {
+ {
+ this.outdatedSessionChecker = initOutdatedSessionChecker();
initializeUnloadedSessions();
+
+ // Setup our SnapshotManager
+ initSnapshotManager();
// Add SnapshotValve and, if needed, JvmRouteValve and batch repl valve
installValves();
+
+ backgroundProcessAllowed.set(true);
started_ = true;
// Notify our interested LifecycleListeners
lifecycle_.fireLifecycleEvent(AFTER_START_EVENT, this);
- log_.debug("start(): JBossCacheService started");
+ // Let subclasses do what they want
+ startExtensions();
+
+ log_.debug("start(): DistributedCacheManager started");
}
catch (Exception e)
{
@@ -1897,16 +2151,30 @@
registerManagerMBean();
}
- /**
- * Accesses the underlying cache and creates the proxy
- *
- * @throws ClusteringNotSupportedException
- */
- private void initCacheProxy() throws ClusteringNotSupportedException
+ protected void configureUnembedded() throws LifecycleException
{
- proxy_ = distributedCacheManagerFactory.getDistributedCacheManager(this);
+ if (snapshotMode_ == null)
+ {
+ // We were not instantiated by a JBossCacheCluster, so we need to
+ // find one and let it configure our cluster-wide properties
+ try
+ {
+ JBossCacheCluster cluster = (JBossCacheCluster) container_.getCluster();
+ if (cluster == null)
+ {
+ cluster = new JBossCacheCluster();
+ }
+ cluster.configureManager(this);
+ }
+ catch (ClassCastException e)
+ {
+ String msg = "Cluster is not an instance of JBossCacheCluster";
+ log_.error(msg, e);
+ throw new LifecycleException(msg, e);
+ }
+ }
}
-
+
private void synthesizeReplicationConfig()
{
ReplicationConfig cfg = new ReplicationConfig();
@@ -1920,199 +2188,7 @@
cfg.setSessionNotificationPolicy(notificationPolicyClass_);
this.replicationConfig_ = cfg;
}
-
- private void initClusteredSessionNotificationPolicy()
- {
- if (this.notificationPolicyClass_ == null || this.notificationPolicyClass_.length() == 0)
- {
- this.notificationPolicyClass_ = AccessController.doPrivileged(new PrivilegedAction<String>()
- {
- public String run()
- {
- return System.getProperty("jboss.web.clustered.session.notification.policy",
- IgnoreUndeployLegacyClusteredSessionNotificationPolicy.class.getName());
- }
- });
- }
-
- try
- {
- this.notificationPolicy_ = (ClusteredSessionNotificationPolicy) Thread.currentThread().getContextClassLoader().loadClass(this.notificationPolicyClass_).newInstance();
- }
- catch (RuntimeException e)
- {
- throw e;
- }
- catch (Exception e)
- {
- throw new RuntimeException("Failed to instantiate " +
- ClusteredSessionNotificationPolicy.class.getName() +
- " " + this.notificationPolicyClass_, e);
- }
-
- this.notificationPolicy_.setClusteredSessionNotificationCapability(new ClusteredSessionNotificationCapability());
- }
- /**
- * Gets the ids of all sessions in the distributed cache and adds
- * them to the unloaded sessions map, along with their lastAccessedTime
- * and their maxInactiveInterval. Passivates overage or excess sessions.
- */
- private void initializeUnloadedSessions()
- {
- Map<String, String> sessions = proxy_.getSessionIds();
- if (sessions != null)
- {
- boolean passivate = isPassivationEnabled();
-
- long passivationMax = passivationMaxIdleTime_ * 1000L;
- long passivationMin = passivationMinIdleTime_ * 1000L;
-
- for (Map.Entry<String, String> entry : sessions.entrySet())
- {
- String realId = entry.getKey();
- String owner = entry.getValue();
-
- long ts = -1;
- DistributableSessionMetadata md = null;
- try
- {
- IncomingDistributableSessionData sessionData = proxy_.getSessionData(realId, owner, false);
- ts = sessionData.getTimestamp();
- md = sessionData.getMetadata();
- }
- catch (Exception e)
- {
- // most likely a lock conflict if the session is being updated remotely;
- // ignore it and use default values for timstamp and maxInactive
- log_.debug("Problem reading metadata for session " + realId + " -- " + e.toString());
- }
-
- long lastMod = ts == -1 ? System.currentTimeMillis() : ts;
- int maxLife = md == null ? getMaxInactiveInterval() : md.getMaxInactiveInterval();
-
- OwnedSessionUpdate osu = new OwnedSessionUpdate(owner, lastMod, maxLife, false);
- unloadedSessions_.put(realId, osu);
- if (passivate)
- {
- try
- {
- long elapsed = System.currentTimeMillis() - lastMod;
- // if maxIdle time configured, means that we need to passivate sessions that have
- // exceeded the max allowed idle time
- if (passivationMax >= 0
- && elapsed > passivationMax)
- {
- if (trace_)
- {
- log_.trace("Elapsed time of " + elapsed + " for session "+
- realId + " exceeds max of " + passivationMax + "; passivating");
- }
- processUnloadedSessionPassivation(realId, osu);
- }
- // If the session didn't exceed the passivationMaxIdleTime_, see
- // if the number of sessions managed by this manager greater than the max allowed
- // active sessions, passivate the session if it exceed passivationMinIdleTime_
- else if (maxActiveAllowed_ > 0
- && passivationMin >= 0
- && calcActiveSessions() > maxActiveAllowed_
- && elapsed >= passivationMin)
- {
- if (trace_)
- {
- log_.trace("Elapsed time of " + elapsed + " for session "+
- realId + " exceeds min of " + passivationMin + "; passivating");
- }
- processUnloadedSessionPassivation(realId, osu);
- }
- }
- catch (Exception e)
- {
- // most likely a lock conflict if the session is being updated remotely; ignore it
- log_.debug("Problem passivating session " + realId + " -- " + e.toString());
- }
- }
- }
- }
- }
-
- /**
- * Instantiate a SnapshotManager and ClusteredSessionValve and add
- * the valve to our parent Context's pipeline.
- * Add a JvmRouteValve and BatchReplicationClusteredSessionValve if needed.
- */
- private void installValves()
- {
- log_.debug("Adding LockingValve");
- this.installContextValve(new LockingValve(this.valveLock));
-
- // If JK usage wasn't explicitly configured, default to enabling
- // it if jvmRoute is set on our containing Engine
- if (useJK_ == null)
- {
- useJK_ = Boolean.valueOf(getJvmRoute() != null);
- }
-
- if (getUseJK())
- {
- log_.debug("We are using JK for load-balancing. Adding JvmRouteValve.");
- installContextValve(new JvmRouteValve(this));
- }
-
- // Handle batch replication if needed.
- // TODO -- should we add this even if not FIELD in case a cross-context
- // call traverses a field-based webapp?
- BatchingManager valveBM = null;
- if (replicationGranularity_ == ReplicationGranularity.FIELD
- && Boolean.TRUE.equals(replicationFieldBatchMode_))
- {
- valveBM = this.batchingManager;
- log_.debug("Including transaction manager in ClusteredSessionValve to support batch replication.");
- }
-
- // Add clustered session valve
- ClusteredSessionValve valve = new ClusteredSessionValve(this, valveBM);
- log_.debug("Adding ClusteredSessionValve");
- installContextValve(valve);
- }
-
- /**
- * Create and start a snapshot manager.
- */
- private void initSnapshotManager()
- {
- String ctxPath = ((Context) container_).getPath();
- if (SnapshotMode.INSTANT == snapshotMode_)
- {
- snapshotManager_ = new InstantSnapshotManager(this, ctxPath);
- }
- else if (snapshotMode_ == null)
- {
- log_.warn("Snapshot mode must be 'instant' or 'interval' - " +
- "using 'instant'");
- snapshotMode_ = SnapshotMode.INSTANT;
- snapshotManager_ = new InstantSnapshotManager(this, ctxPath);
- }
- else if (ReplicationGranularity.FIELD == replicationGranularity_)
- {
- throw new IllegalStateException("Property snapshotMode must be " +
- SnapshotMode.INTERVAL + " when FIELD granularity is used");
- }
- else if (snapshotInterval_ < 1)
- {
- log_.warn("Snapshot mode set to 'interval' but snapshotInterval is < 1 " +
- "using 'instant'");
- snapshotMode_ = SnapshotMode.INSTANT;
- snapshotManager_ = new InstantSnapshotManager(this, ctxPath);
- }
- else
- {
- snapshotManager_ = new IntervalSnapshotManager(this, ctxPath, snapshotInterval_);
- }
-
- snapshotManager_.start();
- }
-
private void installContextValve(Valve valve)
{
boolean installed = false;
@@ -2143,14 +2219,14 @@
if (!installed)
{
// If possible install via the ContainerBase.addValve() API.
- if (container_ instanceof ContainerBase)
+ if (this.container_ instanceof ContainerBase)
{
- ((ContainerBase) container_).addValve(valve);
+ ((ContainerBase) this.container_).addValve(valve);
}
else
{
// No choice; have to add it to the context's pipeline
- container_.getPipeline().addValve(valve);
+ this.container_.getPipeline().addValve(valve);
}
}
}
@@ -2168,7 +2244,7 @@
return null;
}
}
-
+
/**
* Clear the underlying cache store.
*/
@@ -2227,9 +2303,9 @@
{
OwnedSessionUpdate osu = entry.getValue();
// Ignore the marker entries for our passivated sessions
- if (!osu.passivated)
+ if (!osu.isPassivated())
{
- proxy_.evictSession(realId, osu.owner);
+ proxy_.evictSession(realId, osu.getOwner());
}
}
else
@@ -2258,8 +2334,9 @@
super.start();
initClusteredSessionNotificationPolicy();
+ this.outdatedSessionChecker = initOutdatedSessionChecker();
- // Start the JBossCacheService
+ // Start the DistributedCacheManager
// Will need to pass the classloader that is associated with this
// web app so de-serialization will work correctly.
tcl_ = super.getContainer().getLoader().getClassLoader();
@@ -2268,7 +2345,7 @@
{
if (proxy_ == null)
{
- initCacheProxy();
+ initDistributedCacheManager();
}
proxy_.start();
@@ -2286,8 +2363,11 @@
// Add SnapshotValve and, if needed, JvmRouteValve and batch repl valve
installValves();
+
+ // Let subclasses do what they want
+ startExtensions();
- log_.debug("start(): JBossCacheService started");
+ log_.debug("start(): DistributedCacheManager started");
}
catch (LifecycleException le)
{
@@ -2353,22 +2433,6 @@
// ------------------------------------------------------------ Inner Classes
- private class OwnedSessionUpdate
- {
- String owner;
- long updateTime;
- int maxInactive;
- boolean passivated;
-
- OwnedSessionUpdate(String owner, long updateTime, int maxInactive, boolean passivated)
- {
- this.owner = owner;
- this.updateTime = updateTime;
- this.maxInactive = maxInactive;
- this.passivated = passivated;
- }
- }
-
private class PassivationCheck implements Comparable<PassivationCheck>
{
private final String realId;
@@ -2396,11 +2460,11 @@
private long getLastUpdate()
{
- return osu == null ? session.getLastAccessedTimeInternal() : osu.updateTime;
+ return osu == null ? session.getLastAccessedTimeInternal() : osu.getUpdateTime();
}
private void passivate()
- {
+ {
if (osu == null)
{
JBossCacheManager.this.processSessionPassivation(realId);
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossManager.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossManager.java 2009-07-14 14:54:17 UTC (rev 91218)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossManager.java 2009-07-14 15:00:09 UTC (rev 91219)
@@ -90,14 +90,14 @@
* than maxActiveAllowed_ sessions are in memory.
* Setting to -1 means it's ignored.
*/
- protected int passivationMinIdleTime_ = -1;
+ protected long passivationMinIdleTime_ = -1;
/**
* Max time (milliseconds) the session must be idle since lastAccesstime before
* it will be passivated if passivation is enabled.
* Setting to -1 means session should not be forced out.
*/
- protected int passivationMaxIdleTime_ = -1;
+ protected long passivationMaxIdleTime_ = -1;
/**
* The lifecycle_ event support for this component.
@@ -230,6 +230,36 @@
// -------------------------------------------------------------- Properties
+ public boolean getUseSessionPassivation()
+ {
+ return passivationMode_;
+ }
+
+ public void setUseSessionPassivation(boolean enabled)
+ {
+ this.passivationMode_ = enabled;
+ }
+
+ public long getPassivationMinIdleTime()
+ {
+ return passivationMinIdleTime_;
+ }
+
+ public void setPassivationMinIdleTime(long passivationMinIdleTime)
+ {
+ this.passivationMinIdleTime_ = passivationMinIdleTime;
+ }
+
+ public long getPassivationMaxIdleTime()
+ {
+ return passivationMaxIdleTime_;
+ }
+
+ public void setPassivationMaxIdleTime(long passivationMaxIdleTime)
+ {
+ this.passivationMaxIdleTime_ = passivationMaxIdleTime;
+ }
+
// ---------------------------------------------------- AbstractJBossManager
/**
@@ -248,15 +278,15 @@
{
if (pConfig.getUseSessionPassivation() != null)
{
- passivationMode_ = pConfig.getUseSessionPassivation().booleanValue();
- if (passivationMode_)
+ setUseSessionPassivation(pConfig.getUseSessionPassivation().booleanValue());
+ if (getUseSessionPassivation())
{
Integer min = pConfig.getPassivationMinIdleTime();
if (min != null)
- passivationMinIdleTime_ = min.intValue();
+ setPassivationMinIdleTime(min.intValue());
Integer max = pConfig.getPassivationMaxIdleTime();
if (max != null)
- passivationMaxIdleTime_ = max.intValue();
+ setPassivationMaxIdleTime(max.intValue());
}
}
}
Copied: trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/OutdatedSessionChecker.java (from rev 91184, branches/JBPAPP_5_0/tomcat/src/main/org/jboss/web/tomcat/service/session/OutdatedSessionChecker.java)
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/OutdatedSessionChecker.java (rev 0)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/OutdatedSessionChecker.java 2009-07-14 15:00:09 UTC (rev 91219)
@@ -0,0 +1,18 @@
+/**
+ *
+ */
+package org.jboss.web.tomcat.service.session;
+
+import org.jboss.web.tomcat.service.session.distributedcache.spi.OutgoingDistributableSessionData;
+
+/**
+ *
+ *
+ * @author Brian Stansberry
+ *
+ * @version $Revision: $
+ */
+public interface OutdatedSessionChecker
+{
+ boolean isSessionOutdated(ClusteredSession<? extends OutgoingDistributableSessionData> session);
+}
Copied: trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/OwnedSessionUpdate.java (from rev 91184, branches/JBPAPP_5_0/tomcat/src/main/org/jboss/web/tomcat/service/session/OwnedSessionUpdate.java)
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/OwnedSessionUpdate.java (rev 0)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/OwnedSessionUpdate.java 2009-07-14 15:00:09 UTC (rev 91219)
@@ -0,0 +1,45 @@
+/**
+ *
+ */
+package org.jboss.web.tomcat.service.session;
+
+public class OwnedSessionUpdate
+{
+ private final String owner;
+ private final long updateTime;
+ private final int maxInactive;
+ private boolean passivated;
+
+ public OwnedSessionUpdate(String owner, long updateTime, int maxInactive, boolean passivated)
+ {
+ this.owner = owner;
+ this.updateTime = updateTime;
+ this.maxInactive = maxInactive;
+ this.passivated = passivated;
+ }
+
+ public boolean isPassivated()
+ {
+ return passivated;
+ }
+
+ void setPassivated(boolean passivated)
+ {
+ this.passivated = passivated;
+ }
+
+ public String getOwner()
+ {
+ return owner;
+ }
+
+ public long getUpdateTime()
+ {
+ return updateTime;
+ }
+
+ public int getMaxInactive()
+ {
+ return maxInactive;
+ }
+}
\ No newline at end of file
Copied: trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent (from rev 91184, branches/JBPAPP_5_0/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent)
Modified: trunk/tools/etc/buildmagic/modules.ent
===================================================================
--- trunk/tools/etc/buildmagic/modules.ent 2009-07-14 14:54:17 UTC (rev 91218)
+++ trunk/tools/etc/buildmagic/modules.ent 2009-07-14 15:00:09 UTC (rev 91219)
@@ -21,6 +21,7 @@
<pathelement path="${jboss.tomcat.lib}/jbossweb-cluster.aop"/>
<pathelement path="${jboss.tomcat.root}/target/resource"/>
<pathelement path="${jboss.tomcat.root}/target/deploy/jbossweb.sar/jboss-web-service.jar"/>
+ <pathelement path="${jboss.tomcat.root}/target/deploy/jboss-web.deployer/jboss-web-deployer.jar"/>
</path>
<!-- Cluster -->
More information about the jboss-cvs-commits
mailing list