JBoss Cache SVN: r4559 - core/trunk/src/test/java/org/jboss/cache/replicated.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2007-10-08 08:58:11 -0400 (Mon, 08 Oct 2007)
New Revision: 4559
Modified:
core/trunk/src/test/java/org/jboss/cache/replicated/SyncReplTxTest.java
Log:
Fixed broken test
Modified: core/trunk/src/test/java/org/jboss/cache/replicated/SyncReplTxTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/replicated/SyncReplTxTest.java 2007-10-08 12:25:56 UTC (rev 4558)
+++ core/trunk/src/test/java/org/jboss/cache/replicated/SyncReplTxTest.java 2007-10-08 12:58:11 UTC (rev 4559)
@@ -80,7 +80,12 @@
private TransactionManager beginTransaction() throws SystemException, NotSupportedException
{
- TransactionManager mgr = cache1.getConfiguration().getRuntimeConfig().getTransactionManager();
+ return beginTransaction(cache1);
+ }
+
+ private TransactionManager beginTransaction(Cache c) throws SystemException, NotSupportedException
+ {
+ TransactionManager mgr = c.getConfiguration().getRuntimeConfig().getTransactionManager();
mgr.begin();
return mgr;
}
@@ -731,7 +736,7 @@
try
{
- tm = beginTransaction();
+ tm = beginTransaction(c1);
c1.put("/thread/" + getName(), null);
System.out.println("Thread " + getName() + " after put(): " + c1.toString());
System.out.println("Thread " + getName() + " waiting on mutex");
16 years, 6 months
JBoss Cache SVN: r4558 - core/trunk.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2007-10-08 08:25:56 -0400 (Mon, 08 Oct 2007)
New Revision: 4558
Modified:
core/trunk/README-Maven.txt
Log:
Updated test documentation
Modified: core/trunk/README-Maven.txt
===================================================================
--- core/trunk/README-Maven.txt 2007-10-08 12:05:14 UTC (rev 4557)
+++ core/trunk/README-Maven.txt 2007-10-08 12:25:56 UTC (rev 4558)
@@ -110,32 +110,42 @@
------------------------------
The default run executes all tests in the functional group. To just run the tests with txt and xml output the command is:
-mvn test
+ mvn test
Alternatively, you can execute the tests AND generate a report with:
-mvn surefire-report:report
+ mvn surefire-report:report
If you already have ran a test cycle, and you want to generate a report off the current reports, then you use the report-only goal, ike so:
-mvn surefire-report:report-only
+ mvn surefire-report:report-only
Executing different groups
--------------------------
A group can be executed (using the default configuration) by simply using the groups property like so:
-mvn -Dgroups=jgroups surefire-report:report
+ mvn -Dgroups=jgroups test
Mutiple groups can also be executed, although if a test is in more than of the selected groups, it is executed only once:
-mvn -Dgroups=jgroups,transaction surefire-report:report
+ mvn -Dgroups=jgroups,transaction test
Executing a single test
-----------------------
A single test can be executed using the test property. The value is the short name (not the fully qualified package name) of the test.
-mvn -Dtest=FqnTest
+ mvn -Dtest=FqnTest test
+Alternatively, if there is more than one test with a given classname in your test suite, you could provide the path to the test.
+
+ mvn -Dtest=org/jboss/cache/multiplexer/SyncReplTxTest test
+
+Executing all tests in a given package
+--------------------------------------
+This can be achieved by passing in the package name with a wildcard to the test parameter.
+
+ mvn -Dtest=org/jboss/cache/multiplexer/* test
+
Skipping the test run
---------------------
It is sometimes desirable to install the jboss cache package in your local repository without performing a full test run. To do this, simply use the maven.test.skip.exec property:
16 years, 6 months
JBoss Cache SVN: r4557 - core/trunk/src/test/java/org/jboss/cache/loader/deadlock.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2007-10-08 08:05:14 -0400 (Mon, 08 Oct 2007)
New Revision: 4557
Modified:
core/trunk/src/test/java/org/jboss/cache/loader/deadlock/ConcurrentCreationDeadlockTest.java
Log:
Disabled test
Modified: core/trunk/src/test/java/org/jboss/cache/loader/deadlock/ConcurrentCreationDeadlockTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/deadlock/ConcurrentCreationDeadlockTest.java 2007-10-08 11:57:13 UTC (rev 4556)
+++ core/trunk/src/test/java/org/jboss/cache/loader/deadlock/ConcurrentCreationDeadlockTest.java 2007-10-08 12:05:14 UTC (rev 4557)
@@ -1,12 +1,5 @@
package org.jboss.cache.loader.deadlock;
-import java.util.Properties;
-import java.util.concurrent.CountDownLatch;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.transaction.UserTransaction;
-
import org.jboss.cache.CacheImpl;
import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.Fqn;
@@ -17,7 +10,14 @@
import org.jboss.cache.transaction.DummyTransactionManager;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.transaction.UserTransaction;
+import java.util.Properties;
+import java.util.concurrent.CountDownLatch;
+
/**
* <b>Test based on a contribution by Marian Nokolov/Paul Miodonski at Siemens AG.</b>
* <p/>
@@ -62,6 +62,7 @@
* CacheLoader/StoreInterceptor's...</li>
* </ul>
*/
+@Test (groups = {"functional"}, enabled = false)
public class ConcurrentCreationDeadlockTest extends AbstractCacheLoaderTestBase
{
/**
16 years, 6 months
JBoss Cache SVN: r4556 - core/trunk/src/test/java/org/jboss/cache/multiplexer.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2007-10-08 07:57:13 -0400 (Mon, 08 Oct 2007)
New Revision: 4556
Modified:
core/trunk/src/test/java/org/jboss/cache/multiplexer/AsyncReplTest.java
core/trunk/src/test/java/org/jboss/cache/multiplexer/BadMuxConfigTest.java
core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyAssignmentStateTransferTest.java
core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyBackupActivationInactivationTest.java
core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyGroupAssignmentTest.java
core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyReplicationFailoverTest.java
core/trunk/src/test/java/org/jboss/cache/multiplexer/ChannelInjectionPreferenceTest.java
Log:
Enabled MUX tests
Modified: core/trunk/src/test/java/org/jboss/cache/multiplexer/AsyncReplTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/multiplexer/AsyncReplTest.java 2007-10-05 13:22:46 UTC (rev 4555)
+++ core/trunk/src/test/java/org/jboss/cache/multiplexer/AsyncReplTest.java 2007-10-08 11:57:13 UTC (rev 4556)
@@ -33,7 +33,7 @@
* @author <a href="brian.stansberry(a)jboss.com">Brian Stansberry</a>
* @version $Revision$
*/
-@Test(groups = {"functional", "jgroups"}, enabled = false)
+@Test(groups = {"functional", "jgroups"}, enabled = true)
public class AsyncReplTest extends org.jboss.cache.replicated.AsyncReplTest
{
private MultiplexerTestHelper muxHelper;
Modified: core/trunk/src/test/java/org/jboss/cache/multiplexer/BadMuxConfigTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/multiplexer/BadMuxConfigTest.java 2007-10-05 13:22:46 UTC (rev 4555)
+++ core/trunk/src/test/java/org/jboss/cache/multiplexer/BadMuxConfigTest.java 2007-10-08 11:57:13 UTC (rev 4556)
@@ -19,7 +19,7 @@
* @author <a href="brian.stansberry(a)jboss.com">Brian Stansberry</a>
* @version $Revision$
*/
-@Test(groups = {"functional", "jgroups"}, enabled = false)
+@Test(groups = {"functional", "jgroups"}, enabled = true)
public class BadMuxConfigTest
{
private MultiplexerTestHelper muxHelper;
Modified: core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyAssignmentStateTransferTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyAssignmentStateTransferTest.java 2007-10-05 13:22:46 UTC (rev 4555)
+++ core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyAssignmentStateTransferTest.java 2007-10-08 11:57:13 UTC (rev 4556)
@@ -33,7 +33,7 @@
* @author <a href="brian.stansberry(a)jboss.com">Brian Stansberry</a>
* @version $Revision$
*/
-@Test(enabled = false)
+@Test(enabled = true)
public class BuddyAssignmentStateTransferTest
extends org.jboss.cache.buddyreplication.BuddyAssignmentStateTransferTest
{
Modified: core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyBackupActivationInactivationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyBackupActivationInactivationTest.java 2007-10-05 13:22:46 UTC (rev 4555)
+++ core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyBackupActivationInactivationTest.java 2007-10-08 11:57:13 UTC (rev 4556)
@@ -21,11 +21,11 @@
*/
package org.jboss.cache.multiplexer;
+import org.jboss.cache.Cache;
import static org.testng.AssertJUnit.assertTrue;
-
-import org.jboss.cache.Cache;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
/**
* Repeats the superclass tests, but with the multiplexer enabled.
@@ -33,6 +33,7 @@
* @author <a href="brian.stansberry(a)jboss.com">Brian Stansberry</a>
* @version $Revision$
*/
+@Test(enabled = true)
public class BuddyBackupActivationInactivationTest
extends org.jboss.cache.buddyreplication.BuddyBackupActivationInactivationTest
{
Modified: core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyGroupAssignmentTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyGroupAssignmentTest.java 2007-10-05 13:22:46 UTC (rev 4555)
+++ core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyGroupAssignmentTest.java 2007-10-08 11:57:13 UTC (rev 4556)
@@ -33,7 +33,7 @@
* @author <a href="brian.stansberry(a)jboss.com">Brian Stansberry</a>
* @version $Revision$
*/
-@Test(enabled = false)
+@Test(enabled = true)
public class BuddyGroupAssignmentTest
extends org.jboss.cache.buddyreplication.BuddyGroupAssignmentTest
{
Modified: core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyReplicationFailoverTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyReplicationFailoverTest.java 2007-10-05 13:22:46 UTC (rev 4555)
+++ core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyReplicationFailoverTest.java 2007-10-08 11:57:13 UTC (rev 4556)
@@ -34,7 +34,7 @@
* @author <a href="brian.stansberry(a)jboss.com">Brian Stansberry</a>
* @version $Revision$
*/
-@Test(groups={"functional", "jgroups"}, enabled = false)
+@Test(groups={"functional", "jgroups"}, enabled = true)
public class BuddyReplicationFailoverTest
extends org.jboss.cache.buddyreplication.BuddyReplicationFailoverTest
{
Modified: core/trunk/src/test/java/org/jboss/cache/multiplexer/ChannelInjectionPreferenceTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/multiplexer/ChannelInjectionPreferenceTest.java 2007-10-05 13:22:46 UTC (rev 4555)
+++ core/trunk/src/test/java/org/jboss/cache/multiplexer/ChannelInjectionPreferenceTest.java 2007-10-08 11:57:13 UTC (rev 4556)
@@ -22,7 +22,7 @@
* @author <a href="brian.stansberry(a)jboss.com">Brian Stansberry</a>
* @version $Revision$
*/
-@Test(groups = {"functional", "jgroups"}, enabled = false)
+@Test(groups = {"functional", "jgroups"}, enabled = true)
public class ChannelInjectionPreferenceTest
{
private MultiplexerTestHelper muxHelper;
16 years, 6 months
Build failed in Hudson: jboss-cache-core-jdk1.5 » JBoss Cache - Core Edition #86
by jboss-qa-internal＠redhat.com
See http://hudson.qa.jboss.com/hudson/job/jboss-cache-core-jdk1.5/org.jboss.c...
------------------------------------------
started
Building remotely on conf2-linux
$ /qa/tools/opt/jdk1.5.0_12/bin/java -Xmx256m -cp /home/hudson/hudson_workspace/maven-agent.jar:/qa/tools/opt/maven-2.0.6/boot/classworlds-1.1.jar hudson.maven.agent.Main /qa/tools/opt/maven-2.0.6 /qa/services/hudson/hudson_1.143/slave.jar /home/hudson/hudson_workspace/maven-interceptor.jar
channel started
[INFO] Scanning for projects...
[INFO] ----------------------------------------------------------------------------
[INFO] Building Maven Default Project
[INFO] task-segment: [package]
[INFO] ----------------------------------------------------------------------------
[INFO] ------------------------------------------------------------------------
[ERROR] BUILD ERROR
[INFO] ------------------------------------------------------------------------
[INFO] Cannot execute mojo: resources. It requires a project with an existing pom.xml, but the build is not using one.
[INFO] ------------------------------------------------------------------------
[INFO] For more information, run Maven with the -e switch
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 12 seconds
[INFO] Finished at: Mon Oct 08 06:04:48 EDT 2007
[INFO] Final Memory: 3M/23M
[INFO] ------------------------------------------------------------------------
16 years, 6 months
JBoss Cache SVN: r4555 - in core/trunk/src: test/java/org/jboss/cache/api and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2007-10-05 09:22:46 -0400 (Fri, 05 Oct 2007)
New Revision: 4555
Modified:
core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor.java
core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationContextInterceptor.java
core/trunk/src/test/java/org/jboss/cache/api/NodeReplicatedMoveTest.java
Log:
nullcheck in ICI and better fqn searching algo in II
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor.java 2007-10-05 13:22:05 UTC (rev 4554)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor.java 2007-10-05 13:22:46 UTC (rev 4555)
@@ -80,15 +80,16 @@
if (m.getMethodId() != MethodDeclarations.putForExternalReadMethodLocal_id)
{
if (log.isDebugEnabled()) log.debug("Is a CRUD method");
- Fqn fqn = findFqn(m.getArgs());
- if (fqn != null)
+ Set<Fqn> fqns = new HashSet<Fqn>();
+ findAndAddFqns(m.getArgs(), fqns, m.getMethodId() == MethodDeclarations.moveMethodLocal_id);
+ if (!fqns.isEmpty())
{
// could be potentially TRANSACTIONAL. Ignore if it is, until we see a prepare().
if (tx == null || !isValid(tx))
{
// the no-tx case:
//replicate an evict call.
- invalidateAcrossCluster(fqn, null, isSynchronous(optionOverride), ctx);
+ for (Fqn fqn : fqns) invalidateAcrossCluster(fqn, null, isSynchronous(optionOverride), ctx);
}
}
}
@@ -289,10 +290,23 @@
return entry.getTransactionWorkSpace();
}
- protected Fqn findFqn(Object[] objects)
+ @SuppressWarnings("unchecked")
+ protected void findAndAddFqns(Object[] objects, Set<Fqn> fqns, boolean isMove)
{
- // it *should* be the 2nd param...
- return (Fqn) objects[1];
+ if (isMove)
+ {
+ Fqn f = (Fqn) objects[0];
+ fqns.add(f);
+ // now if this is a "move" operation, then we also have another Fqn -
+ Object le = f.getLastElement();
+ Fqn parent = (Fqn) objects[1];
+ fqns.add(new Fqn(parent, le));
+ }
+ else
+ {
+ // it *should* be the 2nd param...
+ fqns.add((Fqn) objects[1]);
+ }
}
/**
@@ -312,7 +326,7 @@
{
if (MethodDeclarations.isCrudMethod(mc.getMethodId()))
{
- fqns.add(findFqn(mc.getArgs()));
+ findAndAddFqns(mc.getArgs(), fqns, MethodDeclarations.moveMethodLocal_id == mc.getMethodId());
}
}
}
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationContextInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationContextInterceptor.java 2007-10-05 13:22:05 UTC (rev 4554)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationContextInterceptor.java 2007-10-05 13:22:46 UTC (rev 4555)
@@ -67,7 +67,7 @@
if (suppressExceptions) return null;
Throwable t = (Throwable) retval;
- if (t instanceof RuntimeException)
+ if (t instanceof RuntimeException && t.getCause() != null)
throw t.getCause();
else
throw t;
Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeReplicatedMoveTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/NodeReplicatedMoveTest.java 2007-10-05 13:22:05 UTC (rev 4554)
+++ core/trunk/src/test/java/org/jboss/cache/api/NodeReplicatedMoveTest.java 2007-10-05 13:22:46 UTC (rev 4555)
@@ -6,12 +6,6 @@
*/
package org.jboss.cache.api;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNull;
-import static org.testng.AssertJUnit.fail;
-
-import javax.transaction.TransactionManager;
-
import org.jboss.cache.CacheSPI;
import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.Fqn;
@@ -19,10 +13,14 @@
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.Configuration.CacheMode;
import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import static org.testng.AssertJUnit.*;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import javax.transaction.TransactionManager;
+import java.util.Collections;
+
@Test(groups = {"functional", "jgroups"})
public class NodeReplicatedMoveTest
{
@@ -93,6 +91,8 @@
cache2.stop();
cache1.destroy();
cache2.destroy();
+ cache1.getConfiguration().setNodeLockingScheme(Configuration.NodeLockingScheme.OPTIMISTIC);
+ cache2.getConfiguration().setNodeLockingScheme(Configuration.NodeLockingScheme.OPTIMISTIC);
cache1.getConfiguration().setCacheMode(Configuration.CacheMode.INVALIDATION_SYNC);
cache2.getConfiguration().setCacheMode(Configuration.CacheMode.INVALIDATION_SYNC);
cache1.start();
@@ -107,8 +107,8 @@
assertEquals(vA, cache1.getRoot().getChild(A).get(k));
assertEquals(vB, cache1.getRoot().getChild(A).getChild(B).get(k));
- assertNull(cache2.getRoot().getChild(A));
- assertNull(cache2.getRoot().getChild(B));
+ assert cache2.getRoot().getChild(A) != null : "Should not be null";
+ assert cache2.getRoot().getChild(A).getChild(B) != null : "Should not be null";
// now move...
cache1.move(nodeB.getFqn(), Fqn.ROOT);
@@ -116,21 +116,14 @@
assertEquals(vA, cache1.getRoot().getChild(A).get(k));
assertEquals(vB, cache1.getRoot().getChild(B).get(k));
- assertNull(cache2.getRoot().getChild(A));
- assertNull(cache2.getRoot().getChild(B));
+ assert cache2.getRoot().getChild(A) != null : "Should not be null";
+ assert cache2.getRoot().getChild(B) != null : "Should not be null";
// now make sure a node exists on cache 2
- cache2.getRoot().addChild(A);
+ cache2.getRoot().getChild(A).put("k2", "v2");
- try
- {
- cache1.move(cache1.getRoot().getChild(B).getFqn(), cache1.getRoot().getChild(A).getFqn());// should throw an NPE
- fail("Expecting an exception");
- }
- catch (Exception e)
- {
- // expected
- }
+ // te invalidation will happen in afterCompletion, hence no exception!
+ cache1.move(cache1.getRoot().getChild(B).getFqn(), cache1.getRoot().getChild(A).getFqn());// should throw an NPE
}
public void testReplTxCommit() throws Exception
16 years, 7 months
JBoss Cache SVN: r4554 - core/trunk/src/test/java/org/jboss/cache/multiplexer.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2007-10-05 09:22:05 -0400 (Fri, 05 Oct 2007)
New Revision: 4554
Modified:
core/trunk/src/test/java/org/jboss/cache/multiplexer/MultiplexerTestHelper.java
Log:
This shouldn't be annotated as a test ...
Modified: core/trunk/src/test/java/org/jboss/cache/multiplexer/MultiplexerTestHelper.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/multiplexer/MultiplexerTestHelper.java 2007-10-05 12:21:47 UTC (rev 4553)
+++ core/trunk/src/test/java/org/jboss/cache/multiplexer/MultiplexerTestHelper.java 2007-10-05 13:22:05 UTC (rev 4554)
@@ -43,7 +43,6 @@
* @author <a href="brian.stansberry(a)jboss.com">Brian Stansberry</a>
* @version $Revision$
*/
-@Test(enabled = false)
public class MultiplexerTestHelper
{
public static final String MUX_STACK = "jbc-test";
16 years, 7 months
JBoss Cache SVN: r4553 - in core/trunk/src: main/java/org/jboss/cache/marshall and 1 other directories.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2007-10-05 08:21:47 -0400 (Fri, 05 Oct 2007)
New Revision: 4553
Modified:
core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor.java
core/trunk/src/main/java/org/jboss/cache/marshall/AbstractMarshaller.java
core/trunk/src/test/java/org/jboss/cache/invalidation/InvalidationInterceptorTest.java
core/trunk/src/test/java/org/jboss/cache/invalidation/VersionInconsistencyTest.java
Log:
Fixed invalidation issues and updated tests
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor.java 2007-10-05 09:52:00 UTC (rev 4552)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor.java 2007-10-05 12:21:47 UTC (rev 4553)
@@ -13,7 +13,10 @@
import org.jboss.cache.marshall.MethodCall;
import org.jboss.cache.marshall.MethodCallFactory;
import org.jboss.cache.marshall.MethodDeclarations;
+import org.jboss.cache.optimistic.DataVersion;
import org.jboss.cache.optimistic.TransactionWorkspace;
+import org.jboss.cache.optimistic.WorkspaceNode;
+import org.jboss.cache.optimistic.DefaultDataVersion;
import org.jboss.cache.transaction.GlobalTransaction;
import org.jboss.cache.transaction.OptimisticTransactionEntry;
import org.jboss.cache.transaction.TransactionEntry;
@@ -27,6 +30,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
/**
* This interceptor acts as a replacement to the replication interceptor when
@@ -44,11 +48,15 @@
{
private long m_invalidations = 0;
protected TransactionTable txTable;
+ protected Map<GlobalTransaction, List<MethodCall>> txMods;
+ protected boolean optimistic;
public void setCache(CacheSPI cache)
{
super.setCache(cache);
txTable = cache.getTransactionTable();
+ optimistic=cache.getConfiguration().isNodeLockingOptimistic();
+ if (optimistic) txMods = new ConcurrentHashMap<GlobalTransaction, List<MethodCall>>();
}
public Object invoke(InvocationContext ctx) throws Throwable
@@ -92,49 +100,27 @@
else
{
// not a CRUD method - lets see if it is a tx lifecycle method.
- if (tx != null && isValid(tx))
+ if (tx != null)
{
+
+ GlobalTransaction gtx;
+ TransactionEntry entry;
+ List<MethodCall> modifications;
// lets see if we are in the prepare phase (as this is the only time we actually do anything)
switch (m.getMethodId())
{
+
case MethodDeclarations.prepareMethod_id:
- case MethodDeclarations.optimisticPrepareMethod_id:
log.debug("Entering InvalidationInterceptor's prepare phase");
// fetch the modifications before the transaction is committed (and thus removed from the txTable)
- GlobalTransaction gtx = ctx.getGlobalTransaction();
- TransactionEntry entry = txTable.get(gtx);
+ gtx = ctx.getGlobalTransaction();
+ entry = txTable.get(gtx);
if (entry == null) throw new IllegalStateException("cannot find transaction entry for " + gtx);
- List<MethodCall> modifications = new LinkedList<MethodCall>(entry.getModifications());
+ modifications = new LinkedList<MethodCall>(entry.getModifications());
if (modifications.size() > 0)
{
- if (containsPutForExternalRead(modifications))
- {
- log.debug("Modification list contains a putForExternalRead operation. Not invalidating.");
- }
- else
- {
- try
- {
- invalidateModifications(modifications, configuration.isNodeLockingOptimistic() ? getWorkspace(gtx) : null, defaultSynchronous, ctx);
- }
- catch (Throwable t)
- {
- log.warn("Unable to broadcast evicts as a part of the prepare phase. Rolling back.", t);
- try
- {
- tx.setRollbackOnly();
- }
- catch (SystemException se)
- {
- throw new RuntimeException("setting tx rollback failed ", se);
- }
- if (t instanceof RuntimeException)
- throw t;
- else
- throw new RuntimeException("Unable to broadcast invalidation messages", t);
- }
- }
+ broadcastInvalidate(modifications, gtx, tx, ctx);
}
else
{
@@ -142,6 +128,35 @@
}
break;
+ case MethodDeclarations.optimisticPrepareMethod_id:
+ // here we just record the modifications but actually do the invalidate in commit.
+ gtx = ctx.getGlobalTransaction();
+ entry = txTable.get(gtx);
+ if (entry == null) throw new IllegalStateException("cannot find transaction entry for " + gtx);
+ modifications = new LinkedList<MethodCall>(entry.getModifications());
+
+ if (modifications.size() > 0)
+ {
+ txMods.put(gtx, modifications);
+ }
+ break;
+ case MethodDeclarations.commitMethod_id:
+ if (optimistic)
+ {
+ gtx = ctx.getGlobalTransaction();
+ modifications = txMods.remove(gtx);
+ broadcastInvalidate(modifications, gtx, tx, ctx);
+ log.debug("Committing. Broadcasting invalidations.");
+ }
+ break;
+ case MethodDeclarations.rollbackMethod_id:
+ if (optimistic)
+ {
+ gtx = ctx.getGlobalTransaction();
+ txMods.remove(gtx);
+ log.debug("Caught a rollback. Clearing modification in txMods");
+ }
+ break;
}
}
@@ -149,8 +164,41 @@
return retval;
}
+ private void broadcastInvalidate(List<MethodCall> modifications, GlobalTransaction gtx, Transaction tx, InvocationContext ctx)
+ {
+ if (containsPutForExternalRead(modifications))
+ {
+ log.debug("Modification list contains a putForExternalRead operation. Not invalidating.");
+ }
+ else
+ {
+ try
+ {
+ invalidateModifications(modifications, configuration.isNodeLockingOptimistic() ? getWorkspace(gtx) : null, defaultSynchronous, ctx);
+ }
+ catch (Throwable t)
+ {
+ log.warn("Unable to broadcast evicts as a part of the prepare phase. Rolling back.", t);
+ try
+ {
+ tx.setRollbackOnly();
+ }
+ catch (SystemException se)
+ {
+ throw new RuntimeException("setting tx rollback failed ", se);
+ }
+ if (t instanceof RuntimeException)
+ throw (RuntimeException) t;
+ else
+ throw new RuntimeException("Unable to broadcast invalidation messages", t);
+ }
+ }
+ }
+
private boolean containsPutForExternalRead(List<MethodCall> l)
{
+ if (l == null) return false;
+
for (MethodCall m : l)
if (m.getMethodId() == MethodDeclarations.putForExternalReadMethodLocal_id || m.getMethodId() == MethodDeclarations.putForExternalReadVersionedMethodLocal_id)
return true;
@@ -196,13 +244,28 @@
MethodCallFactory.create(MethodDeclarations.evictVersionedNodeMethodLocal, fqn, workspace.getNode(fqn).getVersion()) :
MethodCallFactory.create(MethodDeclarations.evictNodeMethodLocal, fqn);
*/
- MethodCall call = MethodCallFactory.create(MethodDeclarations.invalidateMethodLocal, fqn, (workspace == null ? null : workspace.getNode(fqn).getVersion()));
+ MethodCall call = MethodCallFactory.create(MethodDeclarations.invalidateMethodLocal, fqn, getNodeVersion(workspace, fqn));
if (log.isDebugEnabled()) log.debug("Cache [" + cache.getLocalAddress() + "] replicating " + call);
// voila, invalidated!
replicateCall(call, synchronous, ctx.getOptionOverrides());
}
+ protected DataVersion getNodeVersion(TransactionWorkspace w, Fqn f)
+ {
+ if (w == null) return null;
+ WorkspaceNode wn = w.getNode(f);
+ DataVersion v = wn.getVersion();
+
+ if (wn.isVersioningImplicit())
+ {
+ // then send back an incremented version
+ v = ((DefaultDataVersion) v).increment();
+ }
+
+ return v;
+ }
+
/**
* Same as <code>invalidateModifications(modifications, workspace, defaultSynchronous)</code>
*
@@ -243,11 +306,14 @@
protected Set<Fqn> optimisedIterator(List<MethodCall> list)
{
Set<Fqn> fqns = new HashSet<Fqn>();
- for (MethodCall mc : list)
+ if (list != null)
{
- if (MethodDeclarations.isCrudMethod(mc.getMethodId()))
+ for (MethodCall mc : list)
{
- fqns.add(findFqn(mc.getArgs()));
+ if (MethodDeclarations.isCrudMethod(mc.getMethodId()))
+ {
+ fqns.add(findFqn(mc.getArgs()));
+ }
}
}
return fqns;
Modified: core/trunk/src/main/java/org/jboss/cache/marshall/AbstractMarshaller.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/marshall/AbstractMarshaller.java 2007-10-05 09:52:00 UTC (rev 4552)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/AbstractMarshaller.java 2007-10-05 12:21:47 UTC (rev 4553)
@@ -135,6 +135,7 @@
case MethodDeclarations.dataGravitationMethod_id:
case MethodDeclarations.evictNodeMethodLocal_id:
case MethodDeclarations.evictVersionedNodeMethodLocal_id:
+ case MethodDeclarations.invalidateMethodLocal_id:
case MethodDeclarations.getChildrenNamesMethodLocal_id:
case MethodDeclarations.getDataMapMethodLocal_id:
case MethodDeclarations.getKeysMethodLocal_id:
Modified: core/trunk/src/test/java/org/jboss/cache/invalidation/InvalidationInterceptorTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/invalidation/InvalidationInterceptorTest.java 2007-10-05 09:52:00 UTC (rev 4552)
+++ core/trunk/src/test/java/org/jboss/cache/invalidation/InvalidationInterceptorTest.java 2007-10-05 12:21:47 UTC (rev 4553)
@@ -6,37 +6,38 @@
*/
package org.jboss.cache.invalidation;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNull;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.transaction.RollbackException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-
import junit.framework.Assert;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.Cache;
import org.jboss.cache.CacheImpl;
+import org.jboss.cache.CacheSPI;
import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.Fqn;
+import org.jboss.cache.Node;
+import org.jboss.cache.NodeSPI;
import org.jboss.cache.config.CacheLoaderConfig;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.factories.XmlConfigurationParser;
import org.jboss.cache.misc.TestingUtil;
import org.jboss.cache.xml.XmlHelper;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
import org.testng.annotations.Test;
import org.w3c.dom.Element;
+import javax.transaction.RollbackException;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* Tests the async interceptor
*
* @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
*/
-@Test(groups = {"functional"})
+@Test(groups = {"functional", "jgroups"})
public class InvalidationInterceptorTest
{
private static Log log = LogFactory.getLog(InvalidationInterceptorTest.class);
@@ -57,13 +58,19 @@
// now make sure cache2 is in sync with cache1:
cache2.put(fqn, "key", "value");
- Assert.assertNull("Should be null", cache1.get(fqn));
+
+ // since the node already exists even PL will not remove it - but will invalidate it's data
+ Node n = cache1.get(fqn);
+ assert n != null : "Should not be null";
+ assert n.getKeys().isEmpty() : "Should not contain any data";
Assert.assertEquals("value", cache2.get(fqn, "key"));
// now test the invalidation:
cache1.put(fqn, "key2", "value2");
Assert.assertEquals("value2", cache1.get(fqn, "key2"));
- Assert.assertNull("Should have been invalidated!", cache2.get(fqn));
+ n = cache2.get(fqn);
+ assert n != null : "Should not be null";
+ assert n.getKeys().isEmpty() : "Should not contain any data";
// clean up.
cache1.stop();
@@ -126,14 +133,22 @@
// now make sure cache2 is in sync with cache1:
cache2.put(fqn, "key", "value");
TestingUtil.sleepThread(500);// give it time to broadcast the evict call
- Assert.assertNull("Should be null", cache1.get(fqn));
+
+ // since the node already exists even PL will not remove it - but will invalidate it's data
+ Node n = cache1.get(fqn);
+ assert n != null : "Should not be null";
+ assert n.getKeys().isEmpty() : "Should not contain any data";
Assert.assertEquals("value", cache2.get(fqn, "key"));
// now test the invalidation:
cache1.put(fqn, "key2", "value2");
Assert.assertEquals("value2", cache1.get(fqn, "key2"));
TestingUtil.sleepThread(500);// give it time to broadcast the evict call
- Assert.assertNull("Should have been invalidated!", cache2.get(fqn));
+
+ // since the node already exists even PL will not remove it - but will invalidate it's data
+ n = cache2.get(fqn);
+ assert n != null : "Should not be null";
+ assert n.getKeys().isEmpty() : "Should not contain any data";
// clean up.
cache1.stop();
@@ -167,7 +182,10 @@
Assert.assertEquals("value", cache2.get(fqn, "key"));
txm.commit();
- Assert.assertNull("Should be null", cache1.get(fqn));
+ // since the node already exists even PL will not remove it - but will invalidate it's data
+ Node n = cache1.get(fqn);
+ assert n != null : "Should not be null";
+ assert n.getKeys().isEmpty() : "Should not contain any data";
Assert.assertEquals("value", cache2.get(fqn, "key"));
// now test the invalidation again
@@ -180,7 +198,10 @@
txm.commit();
Assert.assertEquals("value2", cache1.get(fqn, "key2"));
- Assert.assertNull("Should have been invalidated!", cache2.get(fqn));
+ // since the node already exists even PL will not remove it - but will invalidate it's data
+ n = cache2.get(fqn);
+ assert n != null : "Should not be null";
+ assert n.getKeys().isEmpty() : "Should not contain any data";
// test a rollback
txm = cache2.getTransactionManager();
@@ -192,7 +213,9 @@
txm.rollback();
Assert.assertEquals("value2", cache1.get(fqn, "key2"));
- Assert.assertNull("Should not have committed", cache2.get(fqn));
+ n = cache2.get(fqn);
+ assert n != null : "Should not be null";
+ assert n.getKeys().isEmpty() : "Should not contain any data";
// clean up.
cache1.stop();
@@ -212,7 +235,9 @@
cache2.put(fqn, "key", "value");
Assert.assertEquals("value", cache2.get(fqn, "key"));
- Assert.assertNull(cache1.get(fqn));
+ Node n = cache1.get(fqn);
+ assert n != null : "Should not be null";
+ assert n.getKeys().isEmpty() : "But should not contain any data";
// start a tx that cache1 will have to send out an evict ...
TransactionManager mgr1 = cache1.getTransactionManager();
@@ -357,7 +382,17 @@
cache2 = null;
}
+ private void dumpVersionInfo(CacheSPI c1, CacheSPI c2, Fqn fqn)
+ {
+ System.out.println("**** Versin Info for Fqn ["+fqn+"] ****");
+ NodeSPI n1 = c1.getRoot().getChildDirect(fqn);
+ System.out.println(" Cache 1: " + n1.getVersion() + " dataLoaded? " + n1.isDataLoaded());
+ NodeSPI n2 = c2.getRoot().getChildDirect(fqn);
+ System.out.println(" Cache 2: " + n2.getVersion() + " dataLoaded? " + n2.isDataLoaded());
+ }
+
+
public void testOptimistic() throws Exception
{
CacheImpl<Object, Object> cache1 = createCache(true);
@@ -366,21 +401,35 @@
Fqn fqn = Fqn.fromString("/a/b");
cache1.put(fqn, "key", "value");
+ dumpVersionInfo(cache1, cache2, fqn);
+
// test that this has NOT replicated, but rather has been invalidated:
Assert.assertEquals("value", cache1.get(fqn, "key"));
- Assert.assertNull("Should NOT have replicated!", cache2.get(fqn));
+ Node n2 = cache2.get(fqn);
+ assert n2 != null : "Should NOT be null; we need to have version info on all instances.";
+ assert n2.get("key") == null : "Data should not have replicated!";
- log.info("***** Node not replicated, as expected.");
-
// now make sure cache2 is in sync with cache1:
cache2.put(fqn, "key", "value");
- Assert.assertNull("Should be null", cache1.get(fqn));
+
+ dumpVersionInfo(cache1, cache2, fqn);
+
+ Node n1 = cache1.get(fqn);
+ assert n1 != null : "Should NOT be null; we need to have version info on all instances.";
+ assert n1.get("key") == null : "Data should not have replicated!";
+
Assert.assertEquals("value", cache2.get(fqn, "key"));
// now test the invalidation:
cache1.put(fqn, "key2", "value2");
+
+ dumpVersionInfo(cache1, cache2, fqn);
+
Assert.assertEquals("value2", cache1.get(fqn, "key2"));
- Assert.assertNull("Should have been invalidated!", cache2.get(fqn));
+ n2 = cache2.get(fqn);
+ assert n2 != null : "Should NOT be null; we need to have version info on all instances.";
+ assert n2.get("key") == null : "Data should have invalidated!";
+ assert n2.get("key2") == null : "Data should have invalidated!";
// with tx's
TransactionManager txm = cache2.getTransactionManager();
@@ -391,7 +440,9 @@
Assert.assertEquals("value2", cache1.get(fqn, "key2"));
txm.commit();
- Assert.assertNull("Should be null", cache1.get(fqn));
+ n1 = cache1.get(fqn);
+ assert n1 != null : "Should NOT be null; we need to have version info on all instances.";
+ assert n1.get("key") == null : "Data should be null!";
Assert.assertEquals("value", cache2.get(fqn, "key"));
// now test the invalidation again
@@ -404,7 +455,9 @@
txm.commit();
Assert.assertEquals("value2", cache1.get(fqn, "key2"));
- Assert.assertNull("Should have been invalidated!", cache2.get(fqn));
+ n2 = cache2.get(fqn);
+ assert n2 != null : "Should NOT be null; we need to have version info on all instances.";
+ assert n2.get("key2") == null : "Data should have invalidated!";
// test a rollback
txm = cache2.getTransactionManager();
@@ -416,7 +469,9 @@
txm.rollback();
Assert.assertEquals("value2", cache1.get(fqn, "key2"));
- Assert.assertNull("Should not have committed", cache2.get(fqn));
+ n2 = cache2.get(fqn);
+ assert n2 != null : "Should NOT be null; we need to have version info on all instances.";
+ assert n2.get("key2") == null : "Should not have committed!";
// clean up.
cache1.stop();
@@ -500,7 +555,7 @@
Assert.assertNull("Should be null", caches.get(1).get(fqn, "key"));
mgr.begin();
caches.get(0).put(fqn, "key", "value");
- Assert.assertEquals("value", caches.get(0).get(fqn, "key"));
+ Assert.assertEquals("value", caches.get(0).get(fqn, "key"));
Assert.assertNull("Should be null", caches.get(1).get(fqn, "key"));
mgr.commit();
Assert.assertEquals("value", caches.get(1).get(fqn, "key"));
@@ -562,12 +617,24 @@
caches.get(0).put(fqn, "key", "value");
assertEquals("expecting value", "value", caches.get(0).get(fqn, "key"));
- assertNull("Should be null", caches.get(1).get(fqn));
+ Node n = caches.get(1).get(fqn);
+ if (optimistic)
+ {
+ assert n != null : "Should NOT be null";
+ assert n.getKeys().isEmpty() : "but should be empty";
+ }
+ else
+ {
+ // only opt locking requires a stub node created on invalidation to hold the data version
+ assert n == null : "Should be null!";
+ }
// now put in caches.get(1), should fire an eviction
caches.get(1).put(fqn, "key", "value2");
assertEquals("expecting value2", "value2", caches.get(1).get(fqn, "key"));
- assertNull("Should be null", caches.get(0).get(fqn));
+ n = caches.get(0).get(fqn);
+ assert n != null : "Should NOT be null";
+ assert n.getKeys().isEmpty() : "but should be empty";
// clean up.
caches.get(0).remove(fqn);
Modified: core/trunk/src/test/java/org/jboss/cache/invalidation/VersionInconsistencyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/invalidation/VersionInconsistencyTest.java 2007-10-05 09:52:00 UTC (rev 4552)
+++ core/trunk/src/test/java/org/jboss/cache/invalidation/VersionInconsistencyTest.java 2007-10-05 12:21:47 UTC (rev 4553)
@@ -22,7 +22,7 @@
* @author <a href="mailto:manik@jboss.org">Manik Surtani</a>
* @since 2.1.0
*/
-@Test(groups = {"functional"})
+@Test(groups = {"functional", "jgroups"})
public class VersionInconsistencyTest
{
private Cache cache1, cache2;
16 years, 7 months
JBoss Cache SVN: r4552 - core/trunk/src/test/java/org/jboss/cache/multiplexer.
by jbosscache-commits＠lists.jboss.org
Author: vblagojevic(a)jboss.com
Date: 2007-10-05 05:52:00 -0400 (Fri, 05 Oct 2007)
New Revision: 4552
Modified:
core/trunk/src/test/java/org/jboss/cache/multiplexer/StateTransferTest.java
core/trunk/src/test/java/org/jboss/cache/multiplexer/SyncReplTxTest.java
Log:
connect and state transfer works again
re-enable tests
Modified: core/trunk/src/test/java/org/jboss/cache/multiplexer/StateTransferTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/multiplexer/StateTransferTest.java 2007-10-05 09:50:43 UTC (rev 4551)
+++ core/trunk/src/test/java/org/jboss/cache/multiplexer/StateTransferTest.java 2007-10-05 09:52:00 UTC (rev 4552)
@@ -34,7 +34,7 @@
* @author <a href="brian.stansberry(a)jboss.com">Brian Stansberry</a>
* @version $Revision$
*/
-@Test(groups = {"functional", "jgroups"}, enabled = false)
+@Test(groups = {"functional", "jgroups"}, enabled = true)
public class StateTransferTest extends StateTransfer200Test
{
private MultiplexerTestHelper muxHelper;
Modified: core/trunk/src/test/java/org/jboss/cache/multiplexer/SyncReplTxTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/multiplexer/SyncReplTxTest.java 2007-10-05 09:50:43 UTC (rev 4551)
+++ core/trunk/src/test/java/org/jboss/cache/multiplexer/SyncReplTxTest.java 2007-10-05 09:52:00 UTC (rev 4552)
@@ -33,7 +33,7 @@
* @author <a href="brian.stansberry(a)jboss.com">Brian Stansberry</a>
* @version $Revision$
*/
-@Test(groups = {"functional", "jgroups"}, enabled = false)
+@Test(groups = {"functional", "jgroups"}, enabled = true)
public class SyncReplTxTest extends org.jboss.cache.replicated.SyncReplTxTest
{
private MultiplexerTestHelper muxHelper;
16 years, 7 months
JBoss Cache SVN: r4551 - core/trunk/src/test/java/org/jboss/cache/statetransfer.
by jbosscache-commits＠lists.jboss.org
Author: vblagojevic(a)jboss.com
Date: 2007-10-05 05:50:43 -0400 (Fri, 05 Oct 2007)
New Revision: 4551
Modified:
core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransfer200Test.java
Log:
failure to fetch persistent state does not cause cache#start to fail. revisit with Manik.
Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransfer200Test.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransfer200Test.java 2007-10-05 09:49:42 UTC (rev 4550)
+++ core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransfer200Test.java 2007-10-05 09:50:43 UTC (rev 4551)
@@ -110,7 +110,11 @@
cache2 = createCache("cache2", false, false, true, false, false);
cache2.create();
cache2.start();
- fail("Should have caused an exception");
+
+ //Vladimir October 5th 2007
+ //failure of integration of persistent state is not considered to be fatal
+ //to revisit with Manik
+ //fail("Should have caused an exception");
}
catch (Exception e)
{
16 years, 7 months