August 2012 - jbosscache-commits - Jboss List Archives

JBoss Cache SVN: r8558 - core/trunk/src/main/java/org/jboss/cache/interceptors.

by jbosscache-commits＠lists.jboss.org

Author: dereed Date: 2012-08-07 14:52:19 -0400 (Tue, 07 Aug 2012) New Revision: 8558 Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java Log: Add tranaction ID to log message about unmatched rollback. Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java 2012-08-06 21:58:21 UTC (rev 8557) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java 2012-08-07 18:52:19 UTC (rev 8558) @@ -242,7 +242,7 @@ ltx = txTable.getLocalTransaction(gtx); if (ltx == null) { - log.warn("No local transaction for this remotely originating rollback. Possibly rolling back before a prepare call was broadcast?"); + log.warn("No local transaction for remotely originating rollback " + gtx + ". Possibly rolling back before a prepare call was broadcast?"); txTable.remove(gtx); // keep track of unmatched rollbacks

12 years, 4 months

1
0
0 / 0

JBoss Cache SVN: r8557 - core/trunk/src/main/java/org/jboss/cache/interceptors.

by jbosscache-commits＠lists.jboss.org

Author: dereed Date: 2012-08-06 17:58:21 -0400 (Mon, 06 Aug 2012) New Revision: 8557 Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java Log: Fixed some log messages Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java 2012-08-06 17:51:04 UTC (rev 8556) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java 2012-08-06 21:58:21 UTC (rev 8557) @@ -206,7 +206,7 @@ // this tx has completed. Clean up in the tx table. txTable.remove(gtx, ltx); } - if (trace) log.trace("Finished remote rollback method for " + gtx); + if (trace) log.trace("Finished remote commit method for " + gtx); } catch (Throwable throwable) { @@ -282,7 +282,7 @@ // this tx has completed. Clean up in the tx table. txTable.remove(gtx, ltx); } - if (trace) log.trace("Finished remote commit/rollback method for " + gtx); + if (trace) log.trace("Finished remote rollback method for " + gtx); } catch (Throwable throwable) { @@ -476,7 +476,7 @@ // try another rollback... try { - log.info("Attempting anotehr rollback"); + log.info("Attempting another rollback"); //invokeOnePhaseCommitMethod(globalTransaction, modifications.size() > 0, false); ltx.rollback(); }

12 years, 4 months

1
0
0 / 0

JBoss Cache SVN: r8556 - in core/support-branches/3.2.8.GA_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/src/main/java/org/jboss/cache: transaction and 1 other directory.

by jbosscache-commits＠lists.jboss.org

Author: dereed Date: 2012-08-06 13:51:04 -0400 (Mon, 06 Aug 2012) New Revision: 8556 Modified: core/support-branches/3.2.8.GA_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java core/support-branches/3.2.8.GA_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/src/main/java/org/jboss/cache/transaction/GlobalTransaction.java Log: [JBPAPP-9614] Backport JBCACHE-1621 Modified: core/support-branches/3.2.8.GA_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java =================================================================== --- core/support-branches/3.2.8.GA_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java 2012-08-06 17:49:04 UTC (rev 8555) +++ core/support-branches/3.2.8.GA_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java 2012-08-06 17:51:04 UTC (rev 8556) @@ -23,6 +23,7 @@ import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -94,6 +95,19 @@ private final Set<Transaction> transactions = new ConcurrentHashSet<Transaction>(); private final Map<Transaction, GlobalTransaction> rollbackTransactions = new ConcurrentHashMap<Transaction, GlobalTransaction>(16); + // A remote PrepareCommand "locks" the transaction by adding gtx to the set + // so a remote RollbackCommand for the same transaction will not be processed simultaneously. + // When it removes the lock, it also calls notifyAll to wake up any waiting rollbacks + // Not used for onePhaseCommit (REPL_ASYNC) + // + // Guarded by synchronized(prepareLockTable) + private final Set<GlobalTransaction> prepareLockTable = new HashSet<GlobalTransaction>(); + + // remote transactions where a RollbackCommand has no matching PrepareCommand yet + // + // Guarded by synchronized(prepareLockTable) + private final Set<GlobalTransaction> unmatchedRollbacks = new HashSet<GlobalTransaction>(); + private long prepares = 0; private long commits = 0; private long rollbacks = 0; @@ -215,12 +229,27 @@ try { if (trace) log.trace("(" + rpcManager.getLocalAddress() + ") call on command [" + command + "]"); - Transaction ltx = txTable.getLocalTransaction(gtx); - if (ltx == null) - { - log.warn("No local transaction for this remotely originating rollback. Possibly rolling back before a prepare call was broadcast?"); - txTable.remove(gtx); - return null; + + Transaction ltx; + + synchronized(prepareLockTable) { + // wait on any PrepareCommand currently running on the same GlobalTransaction + while (prepareLockTable.contains(gtx)) + { + prepareLockTable.wait(); + } + + ltx = txTable.getLocalTransaction(gtx); + if (ltx == null) + { + log.warn("No local transaction for this remotely originating rollback. Possibly rolling back before a prepare call was broadcast?"); + txTable.remove(gtx); + + // keep track of unmatched rollbacks + unmatchedRollbacks.add(gtx); + + return null; + } } // disconnect if we have a current tx associated Transaction currentTx = txManager.getTransaction(); @@ -326,7 +355,21 @@ Transaction ltx = txTable.getLocalTransaction(gtx); Transaction currentTx = txManager.getTransaction(); - Object retval = null; + if (!command.isOnePhaseCommit()) + { + synchronized(prepareLockTable) { + // If a rollback has already been processed for this gtx, do nothing + if (unmatchedRollbacks.contains(gtx)) + { + unmatchedRollbacks.remove(gtx); + return null; + } + + // register "lock" on transaction + prepareLockTable.add(gtx); + } + } + boolean success = false; try { @@ -448,14 +491,25 @@ transactions.remove(ltx);// JBAS-298 } } + else + { + synchronized(prepareLockTable) + { + // release lock + prepareLockTable.remove(gtx); + // wake up any waiting Rollbacks + prepareLockTable.notifyAll(); + } + } + txManager.suspend();// suspends ltx - could be null // resume whatever else we had going. if (currentTx != null) txManager.resume(currentTx); if (trace) log.trace("Finished remote prepare " + gtx); } - return retval; + return null; } private ReplicableCommand attachGlobalTransaction(InvocationContext ctx, Transaction tx, VisitableCommand command) throws Throwable @@ -1216,6 +1270,12 @@ return rollbacks; } + @ManagedAttribute(description = "number of unmatched rollbacks") + public long getUnmatchedRollbacks() + { + return unmatchedRollbacks.size(); + } + @ManagedAttribute(name = "numberOfSyncsRegistered", writable = false, description = "number of transaction synchronizations currently registered") public int getNumberOfSyncsRegistered() { Modified: core/support-branches/3.2.8.GA_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/src/main/java/org/jboss/cache/transaction/GlobalTransaction.java =================================================================== --- core/support-branches/3.2.8.GA_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/src/main/java/org/jboss/cache/transaction/GlobalTransaction.java 2012-08-06 17:49:04 UTC (rev 8555) +++ core/support-branches/3.2.8.GA_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/src/main/java/org/jboss/cache/transaction/GlobalTransaction.java 2012-08-06 17:51:04 UTC (rev 8556) @@ -23,11 +23,14 @@ import org.jgroups.Address; +import org.jgroups.stack.IpAddress; import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; +import java.util.Arrays; +import java.util.Random; import java.util.concurrent.atomic.AtomicLong; @@ -47,6 +50,13 @@ private static AtomicLong sid = new AtomicLong(0); + // addr + instanceId = Unique ID for the cache even after restarting with the same IP:port + private static byte[] instanceId = new byte[4]; + static + { + new Random().nextBytes(instanceId); + } + private Address addr = null; private long id = -1; private transient boolean remote = false; @@ -63,6 +73,18 @@ private GlobalTransaction(Address addr) { + // store instanceId in IpAddress.additionalData (backwards compatible serialization) + if(addr != null && addr instanceof IpAddress) + { + try + { + addr = (Address)((IpAddress)addr).clone(); + ((IpAddress)addr).setAdditionalData(instanceId); + } + catch ( CloneNotSupportedException e ) + { + } + } this.addr = addr; id = sid.getAndIncrement(); } @@ -77,6 +99,7 @@ return addr; } + // only used during externalization public void setAddress(Address address) { addr = address; @@ -87,12 +110,20 @@ return id; } + public byte [] getInstanceId () + { + if(addr == null || ! (addr instanceof IpAddress)) + return null; + return ((IpAddress)addr).getAdditionalData(); + } + @Override public int hashCode() { if (hash_code == -1) { - hash_code = (addr != null ? addr.hashCode() : 0) + (int) id; + hash_code = (addr != null ? addr.hashCode() : 0) + (int) id + + Arrays.hashCode(getInstanceId()); } return hash_code; } @@ -107,7 +138,7 @@ GlobalTransaction otherGtx = (GlobalTransaction) other; boolean aeq = (addr == null) ? (otherGtx.addr == null) : addr.equals(otherGtx.addr); - return aeq && (id == otherGtx.id); + return aeq && (id == otherGtx.id) && Arrays.equals(getInstanceId(), otherGtx.getInstanceId()); } @Override

12 years, 4 months

1
0
0 / 0

JBoss Cache SVN: r8555 - in core/support-branches/3.2.8.GA_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621: src/main/java/org/jboss/cache and 1 other directory.

by jbosscache-commits＠lists.jboss.org

Author: dereed Date: 2012-08-06 13:49:04 -0400 (Mon, 06 Aug 2012) New Revision: 8555 Modified: core/support-branches/3.2.8.GA_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/pom.xml core/support-branches/3.2.8.GA_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/src/main/java/org/jboss/cache/Version.java Log: [JBPAPP-9614] Set version for one-off Modified: core/support-branches/3.2.8.GA_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/pom.xml =================================================================== --- core/support-branches/3.2.8.GA_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/pom.xml 2012-08-06 17:41:48 UTC (rev 8554) +++ core/support-branches/3.2.8.GA_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/pom.xml 2012-08-06 17:49:04 UTC (rev 8555) @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <properties> - <jbosscache-core-version>3.2.8.GA_JBCACHE-1618_JBCACHE-1619</jbosscache-core-version> + <jbosscache-core-version>3.2.8.GA_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621</jbosscache-core-version>  <defaultTestGroup>unit</defaultTestGroup>  Modified: core/support-branches/3.2.8.GA_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/src/main/java/org/jboss/cache/Version.java =================================================================== --- core/support-branches/3.2.8.GA_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/src/main/java/org/jboss/cache/Version.java 2012-08-06 17:41:48 UTC (rev 8554) +++ core/support-branches/3.2.8.GA_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/src/main/java/org/jboss/cache/Version.java 2012-08-06 17:49:04 UTC (rev 8555) @@ -32,10 +32,10 @@ @Immutable public class Version { - public static final String version = "3.2.8.GA_JBCACHE-1618_JBCACHE-1619"; + public static final String version = "3.2.8.GA_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621"; public static final String codename = "Malagueta"; //public static final String cvs = "$Id$"; - static final byte[] version_id = {'0','3','2','8','G','A','_','J','B','C','A','C','H','E','-','1','6','1','8','_','J','B','C','A','C','H','E','-','1','6','1','9'}; + static final byte[] version_id = {'0','3','2','8','G','A','_','J','B','C','A','C','H','E','-','1','6','1','8','_','J','B','C','A','C','H','E','-','1','6','1','9','_','J','B','C','A','C','H','E','-','1','6','2','1'}; private static final int MAJOR_SHIFT = 11; private static final int MINOR_SHIFT = 6;

12 years, 4 months

1
0
0 / 0

JBoss Cache SVN: r8554 - core/support-branches.

by jbosscache-commits＠lists.jboss.org

Author: dereed Date: 2012-08-06 13:41:48 -0400 (Mon, 06 Aug 2012) New Revision: 8554 Added: core/support-branches/3.2.8.GA_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/ Log: [JBPAPP-9614] Backport various fixes to 3.2.8

12 years, 4 months

1
0
0 / 0

JBoss Cache SVN: r8553 - in core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/src/main/java/org/jboss/cache: transaction and 1 other directory.

by jbosscache-commits＠lists.jboss.org

Author: dereed Date: 2012-08-05 13:46:37 -0400 (Sun, 05 Aug 2012) New Revision: 8553 Modified: core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/src/main/java/org/jboss/cache/transaction/GlobalTransaction.java Log: [JBPAPP-9615] Backport JBCACHE-1621 Modified: core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java =================================================================== --- core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java 2012-08-05 17:44:53 UTC (rev 8552) +++ core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java 2012-08-05 17:46:37 UTC (rev 8553) @@ -23,6 +23,7 @@ import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -94,6 +95,19 @@ private final Set<Transaction> transactions = new ConcurrentHashSet<Transaction>(); private final Map<Transaction, GlobalTransaction> rollbackTransactions = new ConcurrentHashMap<Transaction, GlobalTransaction>(16); + // A remote PrepareCommand "locks" the transaction by adding gtx to the set + // so a remote RollbackCommand for the same transaction will not be processed simultaneously. + // When it removes the lock, it also calls notifyAll to wake up any waiting rollbacks + // Not used for onePhaseCommit (REPL_ASYNC) + // + // Guarded by synchronized(prepareLockTable) + private final Set<GlobalTransaction> prepareLockTable = new HashSet<GlobalTransaction>(); + + // remote transactions where a RollbackCommand has no matching PrepareCommand yet + // + // Guarded by synchronized(prepareLockTable) + private final Set<GlobalTransaction> unmatchedRollbacks = new HashSet<GlobalTransaction>(); + private long prepares = 0; private long commits = 0; private long rollbacks = 0; @@ -215,12 +229,27 @@ try { if (trace) log.trace("(" + rpcManager.getLocalAddress() + ") call on command [" + command + "]"); - Transaction ltx = txTable.getLocalTransaction(gtx); - if (ltx == null) - { - log.warn("No local transaction for this remotely originating rollback. Possibly rolling back before a prepare call was broadcast?"); - txTable.remove(gtx); - return null; + + Transaction ltx; + + synchronized(prepareLockTable) { + // wait on any PrepareCommand currently running on the same GlobalTransaction + while (prepareLockTable.contains(gtx)) + { + prepareLockTable.wait(); + } + + ltx = txTable.getLocalTransaction(gtx); + if (ltx == null) + { + log.warn("No local transaction for this remotely originating rollback. Possibly rolling back before a prepare call was broadcast?"); + txTable.remove(gtx); + + // keep track of unmatched rollbacks + unmatchedRollbacks.add(gtx); + + return null; + } } // disconnect if we have a current tx associated Transaction currentTx = txManager.getTransaction(); @@ -326,7 +355,21 @@ Transaction ltx = txTable.getLocalTransaction(gtx); Transaction currentTx = txManager.getTransaction(); - Object retval = null; + if (!command.isOnePhaseCommit()) + { + synchronized(prepareLockTable) { + // If a rollback has already been processed for this gtx, do nothing + if (unmatchedRollbacks.contains(gtx)) + { + unmatchedRollbacks.remove(gtx); + return null; + } + + // register "lock" on transaction + prepareLockTable.add(gtx); + } + } + boolean success = false; try { @@ -448,14 +491,25 @@ transactions.remove(ltx);// JBAS-298 } } + else + { + synchronized(prepareLockTable) + { + // release lock + prepareLockTable.remove(gtx); + // wake up any waiting Rollbacks + prepareLockTable.notifyAll(); + } + } + txManager.suspend();// suspends ltx - could be null // resume whatever else we had going. if (currentTx != null) txManager.resume(currentTx); if (trace) log.trace("Finished remote prepare " + gtx); } - return retval; + return null; } private ReplicableCommand attachGlobalTransaction(InvocationContext ctx, Transaction tx, VisitableCommand command) throws Throwable @@ -1246,6 +1300,12 @@ return rollbacks; } + @ManagedAttribute(description = "number of unmatched rollbacks") + public long getUnmatchedRollbacks() + { + return unmatchedRollbacks.size(); + } + @ManagedAttribute(name = "numberOfSyncsRegistered", writable = false, description = "number of transaction synchronizations currently registered") public int getNumberOfSyncsRegistered() { Modified: core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/src/main/java/org/jboss/cache/transaction/GlobalTransaction.java =================================================================== --- core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/src/main/java/org/jboss/cache/transaction/GlobalTransaction.java 2012-08-05 17:44:53 UTC (rev 8552) +++ core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/src/main/java/org/jboss/cache/transaction/GlobalTransaction.java 2012-08-05 17:46:37 UTC (rev 8553) @@ -23,11 +23,14 @@ import org.jgroups.Address; +import org.jgroups.stack.IpAddress; import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; +import java.util.Arrays; +import java.util.Random; import java.util.concurrent.atomic.AtomicLong; @@ -47,6 +50,13 @@ private static AtomicLong sid = new AtomicLong(0); + // addr + instanceId = Unique ID for the cache even after restarting with the same IP:port + private static byte[] instanceId = new byte[4]; + static + { + new Random().nextBytes(instanceId); + } + private Address addr = null; private long id = -1; private transient boolean remote = false; @@ -63,6 +73,18 @@ private GlobalTransaction(Address addr) { + // store instanceId in IpAddress.additionalData (backwards compatible serialization) + if(addr != null && addr instanceof IpAddress) + { + try + { + addr = (Address)((IpAddress)addr).clone(); + ((IpAddress)addr).setAdditionalData(instanceId); + } + catch ( CloneNotSupportedException e ) + { + } + } this.addr = addr; id = sid.getAndIncrement(); } @@ -77,6 +99,7 @@ return addr; } + // only used during externalization public void setAddress(Address address) { addr = address; @@ -87,12 +110,20 @@ return id; } + public byte [] getInstanceId () + { + if(addr == null || ! (addr instanceof IpAddress)) + return null; + return ((IpAddress)addr).getAdditionalData(); + } + @Override public int hashCode() { if (hash_code == -1) { - hash_code = (addr != null ? addr.hashCode() : 0) + (int) id; + hash_code = (addr != null ? addr.hashCode() : 0) + (int) id + + Arrays.hashCode(getInstanceId()); } return hash_code; } @@ -107,7 +138,7 @@ GlobalTransaction otherGtx = (GlobalTransaction) other; boolean aeq = (addr == null) ? (otherGtx.addr == null) : addr.equals(otherGtx.addr); - return aeq && (id == otherGtx.id); + return aeq && (id == otherGtx.id) && Arrays.equals(getInstanceId(), otherGtx.getInstanceId()); } @Override

12 years, 4 months

1
0
0 / 0

JBoss Cache SVN: r8552 - in core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621: src/main/java/org/jboss/cache and 1 other directory.

by jbosscache-commits＠lists.jboss.org

Author: dereed Date: 2012-08-05 13:44:53 -0400 (Sun, 05 Aug 2012) New Revision: 8552 Modified: core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/pom.xml core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/src/main/java/org/jboss/cache/Version.java Log: [JBPAPP-9615] Update version for one-off Modified: core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/pom.xml =================================================================== --- core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/pom.xml 2012-08-05 17:35:31 UTC (rev 8551) +++ core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/pom.xml 2012-08-05 17:44:53 UTC (rev 8552) @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <properties> - <jbosscache-core-version>3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619</jbosscache-core-version> + <jbosscache-core-version>3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621</jbosscache-core-version>  <defaultTestGroup>unit</defaultTestGroup>  Modified: core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/src/main/java/org/jboss/cache/Version.java =================================================================== --- core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/src/main/java/org/jboss/cache/Version.java 2012-08-05 17:35:31 UTC (rev 8551) +++ core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/src/main/java/org/jboss/cache/Version.java 2012-08-05 17:44:53 UTC (rev 8552) @@ -32,10 +32,10 @@ @Immutable public class Version { - public static final String version = "3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619"; + public static final String version = "3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621"; public static final String codename = "Malagueta"; //public static final String cvs = "$Id$"; - static final byte[] version_id = {'0','3','2','2','G','A','_','J','B','C','A','C','H','E','-','1','6','1','3','_','J','B','C','A','C','H','E','-','1','6','1','7','_','J','B','C','A','C','H','E','-','1','6','1','8','_','J','B','C','A','C','H','E','-','1','6','1','9'}; + static final byte[] version_id = {'0','3','2','2','G','A','_','J','B','C','A','C','H','E','-','1','6','1','3','_','J','B','C','A','C','H','E','-','1','6','1','7','_','J','B','C','A','C','H','E','-','1','6','1','8','_','J','B','C','A','C','H','E','-','1','6','1','9','_','J','B','C','A','C','H','E','-','1','6','2','1'}; private static final int MAJOR_SHIFT = 11; private static final int MINOR_SHIFT = 6;

12 years, 4 months

1
0
0 / 0

JBoss Cache SVN: r8551 - core/support-branches.

by jbosscache-commits＠lists.jboss.org

Author: dereed Date: 2012-08-05 13:35:31 -0400 (Sun, 05 Aug 2012) New Revision: 8551 Added: core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619_JBCACHE-1621/ Log: [JBPAPP-9615] Backport various fixes to 3.2.2

12 years, 4 months

1
0
0 / 0

JBoss Cache SVN: r8550 - core/trunk/src/main/java/org/jboss/cache/interceptors.

by jbosscache-commits＠lists.jboss.org

Author: dereed Date: 2012-08-05 13:23:57 -0400 (Sun, 05 Aug 2012) New Revision: 8550 Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java Log: [JBCACHE-1621] Handle RollbackCommand processed before its matching PrepareCommand. Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java 2012-08-05 17:20:57 UTC (rev 8549) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java 2012-08-05 17:23:57 UTC (rev 8550) @@ -23,6 +23,7 @@ import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -94,6 +95,19 @@ private final Set<Transaction> transactions = new ConcurrentHashSet<Transaction>(); private final Map<Transaction, GlobalTransaction> rollbackTransactions = new ConcurrentHashMap<Transaction, GlobalTransaction>(16); + // A remote PrepareCommand "locks" the transaction by adding gtx to the set + // so a remote RollbackCommand for the same transaction will not be processed simultaneously. + // When it removes the lock, it also calls notifyAll to wake up any waiting rollbacks + // Not used for onePhaseCommit (REPL_ASYNC) + // + // Guarded by synchronized(prepareLockTable) + private final Set<GlobalTransaction> prepareLockTable = new HashSet<GlobalTransaction>(); + + // remote transactions where a RollbackCommand has no matching PrepareCommand yet + // + // Guarded by synchronized(prepareLockTable) + private final Set<GlobalTransaction> unmatchedRollbacks = new HashSet<GlobalTransaction>(); + private long prepares = 0; private long commits = 0; private long rollbacks = 0; @@ -215,12 +229,27 @@ try { if (trace) log.trace("(" + rpcManager.getLocalAddress() + ") call on command [" + command + "]"); - Transaction ltx = txTable.getLocalTransaction(gtx); - if (ltx == null) - { - log.warn("No local transaction for this remotely originating rollback. Possibly rolling back before a prepare call was broadcast?"); - txTable.remove(gtx); - return null; + + Transaction ltx; + + synchronized(prepareLockTable) { + // wait on any PrepareCommand currently running on the same GlobalTransaction + while (prepareLockTable.contains(gtx)) + { + prepareLockTable.wait(); + } + + ltx = txTable.getLocalTransaction(gtx); + if (ltx == null) + { + log.warn("No local transaction for this remotely originating rollback. Possibly rolling back before a prepare call was broadcast?"); + txTable.remove(gtx); + + // keep track of unmatched rollbacks + unmatchedRollbacks.add(gtx); + + return null; + } } // disconnect if we have a current tx associated Transaction currentTx = txManager.getTransaction(); @@ -326,7 +355,21 @@ Transaction ltx = txTable.getLocalTransaction(gtx); Transaction currentTx = txManager.getTransaction(); - Object retval = null; + if (!command.isOnePhaseCommit()) + { + synchronized(prepareLockTable) { + // If a rollback has already been processed for this gtx, do nothing + if (unmatchedRollbacks.contains(gtx)) + { + unmatchedRollbacks.remove(gtx); + return null; + } + + // register "lock" on transaction + prepareLockTable.add(gtx); + } + } + boolean success = false; try { @@ -448,14 +491,25 @@ transactions.remove(ltx);// JBAS-298 } } + else + { + synchronized(prepareLockTable) + { + // release lock + prepareLockTable.remove(gtx); + // wake up any waiting Rollbacks + prepareLockTable.notifyAll(); + } + } + txManager.suspend();// suspends ltx - could be null // resume whatever else we had going. if (currentTx != null) txManager.resume(currentTx); if (trace) log.trace("Finished remote prepare " + gtx); } - return retval; + return null; } private ReplicableCommand attachGlobalTransaction(InvocationContext ctx, Transaction tx, VisitableCommand command) throws Throwable @@ -1246,6 +1300,12 @@ return rollbacks; } + @ManagedAttribute(description = "number of unmatched rollbacks") + public long getUnmatchedRollbacks() + { + return unmatchedRollbacks.size(); + } + @ManagedAttribute(name = "numberOfSyncsRegistered", writable = false, description = "number of transaction synchronizations currently registered") public int getNumberOfSyncsRegistered() {

12 years, 4 months

1
0
0 / 0

JBoss Cache SVN: r8549 - core/trunk/src/main/java/org/jboss/cache/transaction.

by jbosscache-commits＠lists.jboss.org

Author: dereed Date: 2012-08-05 13:20:57 -0400 (Sun, 05 Aug 2012) New Revision: 8549 Modified: core/trunk/src/main/java/org/jboss/cache/transaction/GlobalTransaction.java Log: [JBCACHE-1621] Make GlobalTransaction unique even across a restart of an instance using the same IP:port Modified: core/trunk/src/main/java/org/jboss/cache/transaction/GlobalTransaction.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/transaction/GlobalTransaction.java 2012-08-02 21:22:33 UTC (rev 8548) +++ core/trunk/src/main/java/org/jboss/cache/transaction/GlobalTransaction.java 2012-08-05 17:20:57 UTC (rev 8549) @@ -23,11 +23,14 @@ import org.jgroups.Address; +import org.jgroups.stack.IpAddress; import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; +import java.util.Arrays; +import java.util.Random; import java.util.concurrent.atomic.AtomicLong; @@ -47,6 +50,13 @@ private static AtomicLong sid = new AtomicLong(0); + // addr + instanceId = Unique ID for the cache even after restarting with the same IP:port + private static byte[] instanceId = new byte[4]; + static + { + new Random().nextBytes(instanceId); + } + private Address addr = null; private long id = -1; private transient boolean remote = false; @@ -63,6 +73,18 @@ private GlobalTransaction(Address addr) { + // store instanceId in IpAddress.additionalData (backwards compatible serialization) + if(addr != null && addr instanceof IpAddress) + { + try + { + addr = (Address)((IpAddress)addr).clone(); + ((IpAddress)addr).setAdditionalData(instanceId); + } + catch ( CloneNotSupportedException e ) + { + } + } this.addr = addr; id = sid.getAndIncrement(); } @@ -77,6 +99,7 @@ return addr; } + // only used during externalization public void setAddress(Address address) { addr = address; @@ -87,12 +110,20 @@ return id; } + public byte [] getInstanceId () + { + if(addr == null || ! (addr instanceof IpAddress)) + return null; + return ((IpAddress)addr).getAdditionalData(); + } + @Override public int hashCode() { if (hash_code == -1) { - hash_code = (addr != null ? addr.hashCode() : 0) + (int) id; + hash_code = (addr != null ? addr.hashCode() : 0) + (int) id + + Arrays.hashCode(getInstanceId()); } return hash_code; } @@ -107,7 +138,7 @@ GlobalTransaction otherGtx = (GlobalTransaction) other; boolean aeq = (addr == null) ? (otherGtx.addr == null) : addr.equals(otherGtx.addr); - return aeq && (id == otherGtx.id); + return aeq && (id == otherGtx.id) && Arrays.equals(getInstanceId(), otherGtx.getInstanceId()); } @Override

12 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbosscache-commits August 2012