[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/aop/statetransfer ...
Manik Surtani
msurtani at jboss.com
Sun Dec 3 11:00:28 EST 2006
User: msurtani
Date: 06/12/03 11:00:28
Modified: tests/functional/org/jboss/cache/aop/statetransfer Tag:
Branch_JBossCache_1_3_0
StateTransferAopTestBase.java
Log:
wc
Revision Changes Path
No revision
No revision
1.13.2.1 +36 -13 JBossCache/tests/functional/org/jboss/cache/aop/statetransfer/Attic/StateTransferAopTestBase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: StateTransferAopTestBase.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/aop/statetransfer/Attic/StateTransferAopTestBase.java,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -b -r1.13 -r1.13.2.1
--- StateTransferAopTestBase.java 19 Mar 2006 05:30:55 -0000 1.13
+++ StateTransferAopTestBase.java 3 Dec 2006 16:00:28 -0000 1.13.2.1
@@ -303,12 +303,16 @@
*
* @throws Exception
*/
- public void testConcurrentActivationSync() throws Exception
- {
- log.info("Enter testConcurrentActivationSync");
- concurrentActivationTest(true);
- }
+ // commented out since concurrent activations will cause deadlocks and then timeouts since JBCACHE-875.
+ // Correctness over performance. - Manik
+
+// public void testConcurrentActivationSync() throws Exception
+// {
+// log.info("Enter testConcurrentActivationSync");
+//
+// concurrentActivationTest(true);
+// }
/**
* Tests concurrent activation of the same subtree by multiple nodes in a
@@ -415,13 +419,17 @@
*
* @throws Exception
*/
- public void testConcurrentUseSync() throws Exception
- {
- log.info("Enter testConcurrentUseSync");
- concurrentUseTest(true);
- }
+ // commented out since concurrent activations will cause deadlocks and then timeouts since JBCACHE-875.
+ // Correctness over performance. - Manik
+// public void testConcurrentUseSync() throws Exception
+// {
+// log.info("Enter testConcurrentUseSync");
+//
+// concurrentUseTest(true);
+// }
+//
/**
* Tests partial state transfer under heavy concurrent load and REPL_ASYNC.
* See <code>concurrentUseTest</code> for details.
@@ -471,6 +479,10 @@
{
stressors[i] = new CacheStressor(semaphore, names[i], sync);
caches[i + 1] = stressors[i].getTreeCache();
+ stressors[i].getTreeCache().put("/" + names[i], null);
+ }
+ for (int i = 0; i < count; i++)
+ {
stressors[i].start();
// Give each one a chance to stabilize
sleepThread(100);
@@ -788,6 +800,17 @@
{
try
{
+ TransactionManager m = cache.getTransactionManager();
+ try
+ {
+ if (m!= null && m.getTransaction() != null)
+ {
+ m.rollback();
+ }
+ }
+ catch (Exception e)
+ {
+ }
cache.stopService();
cache.destroyService();
}
More information about the jboss-cvs-commits
mailing list