You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2009/02/11 14:01:46 UTC
svn commit: r743318 - in /jackrabbit/branches/1.5: ./
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/
jackrabbit-co...
Author: jukka
Date: Wed Feb 11 13:01:45 2009
New Revision: 743318
URL: http://svn.apache.org/viewvc?rev=743318&view=rev
Log:
1.5: Merged revision 734400 (JCR-1334). Ignored other revisions.
Added:
jackrabbit/branches/1.5/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/TimeBomb.java
- copied unchanged from r734400, jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/TimeBomb.java
Modified:
jackrabbit/branches/1.5/ (props changed)
jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TransactionContext.java
jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/XASessionImpl.java
jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java
jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/DefaultISMLocking.java
jackrabbit/branches/1.5/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/UserTransactionImpl.java
jackrabbit/branches/1.5/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/XATest.java
jackrabbit/branches/1.5/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/AbstractISMLockingTest.java
Propchange: jackrabbit/branches/1.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 11 13:01:45 2009
@@ -1,2 +1,2 @@
/jackrabbit/branches/1.3:631261
-/jackrabbit/trunk:703899-704158,704165,704167,704324,704358,704361,704864,704933,704939,705010,705033,705243,705496,705522,705579,705925,705932,705934,705937-705938,705961,706242,706273,706285-706286,706562,706606,706649,706655,706660,706697,706918,707303-707304,707307,707310,707630,708206,708598,708609,708613,708619,708634,708840,708863,708909,708929,708943,709115,709142,709207,709211,710047,711238,711566-711567,711595,711841-711843,712984-712985,713037,713059,713065,713072,713076,713162,713214,713956,713958,713964,713971,713975,714034,718218,718249-718250,718371,718376,718566,718632,718981,719225,719282,719575-719577,719579,719585-719586,719588,719592,720455,720484,720492,720524,720533,720540,720673,720679,720687,720784,720940,720969,721186,721191,721194,721235,721387-721389,721470,721495,722068-722069,722463,722465,722467,722470,722825,723281,723346,723728,723784,724300,724387,725292,727376,727388,727390,727395,727397,727402,727492,727701,728022,731896,731934,731941,73234
7,732678,732686,732689,732693,732703,732715-732716,732719,732728,732730,732734-732738,732740,732742-732743,732745,732867,732883,733057-733059,733061,733080,734092,734709
+/jackrabbit/trunk:703899-704158,704165,704167,704324,704358,704361,704864,704933,704939,705010,705033,705243,705496,705522,705579,705925,705932,705934,705937-705938,705961,706242,706273,706285-706286,706562,706606,706649,706655,706660,706697,706918,707303-707304,707307,707310,707630,708206,708598,708609,708613,708619,708634,708840,708863,708909,708929,708943,709115,709142,709207,709211,710047,711238,711566-711567,711595,711841-711843,712984-712985,713037,713059,713065,713072,713076,713162,713214,713956,713958,713964,713971,713975,714034,718218,718249-718250,718371,718376,718566,718632,718981,719225,719282,719575-719577,719579,719585-719586,719588,719592,720455,720484,720492,720524,720533,720540,720673,720679,720687,720784,720940,720969,721186,721191,721194,721235,721387-721389,721470,721495,722068-722069,722463,722465,722467,722470,722825,723281,723346,723728,723784,724300,724387,725292,727376,727388,727390,727395,727397,727402,727492,727701,728022,731896,731934,731941,73234
7,732678,732686,732689,732693,732703,732715-732716,732719,732728,732730,732734-732738,732740,732742-732743,732745,732867,732883,733057-733059,733061,733080,734092,734366,734375,734400,734709
Modified: jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TransactionContext.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TransactionContext.java?rev=743318&r1=743317&r2=743318&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TransactionContext.java (original)
+++ jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TransactionContext.java Wed Feb 11 13:01:45 2009
@@ -21,6 +21,9 @@
import org.apache.jackrabbit.util.Timer;
import javax.transaction.xa.XAException;
+import javax.transaction.xa.Xid;
+
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -47,6 +50,11 @@
private static final int STATUS_ROLLED_BACK = 6;
/**
+ * The per thread associated Xid
+ */
+ private static ThreadLocal CURRENT_XID = new ThreadLocal();
+
+ /**
* Create a global timer for all transaction contexts.
*/
private static final Timer TIMER = new Timer(true);
@@ -62,6 +70,11 @@
private final int timeout;
/**
+ * The Xid
+ */
+ private final Xid xid;
+
+ /**
* Transaction attributes.
*/
private final Map attributes = new HashMap();
@@ -78,10 +91,12 @@
/**
* Create a new instance of this class.
+ * @param xid associated xid
* @param resources transactional resources
* @param timeout timeout, in seconds
*/
- public TransactionContext(InternalXAResource[] resources, int timeout) {
+ public TransactionContext(Xid xid, InternalXAResource[] resources, int timeout) {
+ this.xid = xid;
this.resources = resources;
this.timeout = timeout;
}
@@ -129,6 +144,7 @@
* @throws XAException if an error occurs
*/
public synchronized void prepare() throws XAException {
+ bindCurrentXid();
status = STATUS_PREPARING;
beforeOperation();
@@ -172,6 +188,7 @@
if (status == STATUS_ROLLED_BACK) {
throw new XAException(XAException.XA_RBTIMEOUT);
}
+ bindCurrentXid();
status = STATUS_COMMITTING;
beforeOperation();
@@ -197,6 +214,7 @@
// cancel the rollback task
cancel();
+ cleanCurrentXid();
if (txe != null) {
XAException e = new XAException(XAException.XA_RBOTHER);
@@ -214,6 +232,7 @@
if (status == STATUS_ROLLED_BACK) {
throw new XAException(XAException.XA_RBTIMEOUT);
}
+ bindCurrentXid();
status = STATUS_ROLLING_BACK;
beforeOperation();
@@ -232,6 +251,7 @@
// cancel the rollback task
cancel();
+ cleanCurrentXid();
if (errors != 0) {
throw new XAException(XAException.XA_RBOTHER);
@@ -295,4 +315,43 @@
public void setSuspended(boolean suspended) {
this.suspended = suspended;
}
+
+ /**
+ * Helper Method to bind the {@link Xid} associated with this {@link TransactionContext}
+ * to the {@link #CURRENT_XID} ThreadLocal
+ * @param methodName
+ */
+ private void bindCurrentXid() {
+ CURRENT_XID.set(xid);
+ }
+
+ /**
+ * Helper Method to clean the {@link Xid} associated with this {@link TransactionContext}
+ * from the {@link #CURRENT_XID} ThreadLocal
+ * @param methodName
+ */
+ private void cleanCurrentXid() {
+ CURRENT_XID.set(null);
+ }
+
+ /**
+ * Returns the {@link Xid} bind to the {@link #CURRENT_XID} ThreadLocal
+ * @return current Xid or null
+ */
+ public static Xid getCurrentXid() {
+ return (Xid) CURRENT_XID.get();
+ }
+
+ /**
+ * Helper Method to check if the given {@link Xid} has the same globalTransactionId
+ * as the current {@link Xid} bind to the {@link #CURRENT_XID} ThreadLocal
+ * @param xid Xid to check
+ * @param fallback if either the given {@link Xid} or the current {@link Xid} is null we can not check if they
+ * are same, the fallback value will be returned
+ * @return true if the same otherwise false
+ */
+ public static boolean isCurrentXid(Xid xid, boolean fallback) {
+ Xid currentXid = (Xid) CURRENT_XID.get();
+ return fallback ? true : (currentXid == null || xid == null) ? fallback : Arrays.equals(xid.getGlobalTransactionId(), currentXid.getGlobalTransactionId());
+ }
}
Modified: jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/XASessionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/XASessionImpl.java?rev=743318&r1=743317&r2=743318&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/XASessionImpl.java (original)
+++ jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/XASessionImpl.java Wed Feb 11 13:01:45 2009
@@ -265,7 +265,7 @@
* @return transaction context
*/
private TransactionContext createTransaction(Xid xid) {
- TransactionContext tx = new TransactionContext(txResources, getTransactionTimeout());
+ TransactionContext tx = new TransactionContext(xid, txResources, getTransactionTimeout());
txGlobal.put(xid, tx);
return tx;
}
Modified: jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java?rev=743318&r1=743317&r2=743318&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java (original)
+++ jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java Wed Feb 11 13:01:45 2009
@@ -25,6 +25,8 @@
import org.apache.jackrabbit.core.NodeImpl;
import org.apache.jackrabbit.core.SessionImpl;
import org.apache.jackrabbit.core.SessionListener;
+import org.apache.jackrabbit.core.TransactionContext;
+import org.apache.jackrabbit.core.WorkspaceImpl;
import org.apache.jackrabbit.core.cluster.ClusterOperation;
import org.apache.jackrabbit.core.cluster.LockEventChannel;
import org.apache.jackrabbit.core.cluster.LockEventListener;
@@ -49,6 +51,8 @@
import javax.jcr.lock.LockException;
import javax.jcr.observation.Event;
import javax.jcr.observation.EventIterator;
+import javax.transaction.xa.Xid;
+
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.IOException;
@@ -79,10 +83,44 @@
*/
private final PathMap lockMap = new PathMap();
- /**
- * Lock to path map.
- */
- private final ReentrantLock lockMapLock = new ReentrantLock();
+ private final ReentrantLock lockMapLock = new ReentrantLock(){
+
+ private Xid activeXid;
+
+ public void acquire() throws InterruptedException {
+ if (Thread.interrupted()) throw new InterruptedException();
+ Thread caller = Thread.currentThread();
+ synchronized(this) {
+ boolean allow = TransactionContext.isCurrentXid(activeXid, caller == owner_);
+ if (allow) {
+ ++holds_;
+ } else {
+ try {
+ while (owner_ != null)
+ wait();
+ owner_ = caller;
+ activeXid = (Xid) TransactionContext.getCurrentXid();
+ holds_ = 1;
+ } catch (InterruptedException ex) {
+ notify();
+ throw ex;
+ }
+ }
+ }
+ }
+
+ public synchronized void release() {
+ boolean allow = TransactionContext.isCurrentXid(activeXid, Thread.currentThread() == owner_);
+ if (!allow)
+ throw new Error("Illegal Lock usage");
+
+ if (--holds_ == 0) {
+ owner_ = null;
+ activeXid = null;
+ notify();
+ }
+ }
+ };
/**
* System session
Modified: jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/DefaultISMLocking.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/DefaultISMLocking.java?rev=743318&r1=743317&r2=743318&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/DefaultISMLocking.java (original)
+++ jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/DefaultISMLocking.java Wed Feb 11 13:01:45 2009
@@ -16,7 +16,11 @@
*/
package org.apache.jackrabbit.core.state;
+import javax.transaction.xa.Xid;
+
import org.apache.jackrabbit.core.ItemId;
+import org.apache.jackrabbit.core.TransactionContext;
+
import EDU.oswego.cs.dl.util.concurrent.ReentrantWriterPreferenceReadWriteLock;
import EDU.oswego.cs.dl.util.concurrent.Sync;
@@ -48,6 +52,7 @@
return new WriteLock() {
{
+ rwLock.setActiveXid(TransactionContext.getCurrentXid());
rwLock.writeLock().acquire();
}
@@ -55,6 +60,7 @@
* {@inheritDoc}
*/
public void release() {
+ rwLock.setActiveXid(null);
rwLock.writeLock().release();
}
@@ -88,13 +94,23 @@
private static final class RWLock extends ReentrantWriterPreferenceReadWriteLock {
+ private Xid activeXid;
+
/**
* Allow reader when there is no active writer, or current thread owns
* the write lock (reentrant).
*/
protected boolean allowReader() {
- return activeWriter_ == null
- || activeWriter_ == Thread.currentThread();
+ return TransactionContext.isCurrentXid(activeXid, (activeWriter_ == null || activeWriter_ == Thread.currentThread()));
+ }
+
+ /**
+ * Sets the active Xid
+ * @param id
+ */
+ synchronized void setActiveXid(Xid xid) {
+ activeXid = xid;
}
+
}
}
Modified: jackrabbit/branches/1.5/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/UserTransactionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/UserTransactionImpl.java?rev=743318&r1=743317&r2=743318&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/UserTransactionImpl.java (original)
+++ jackrabbit/branches/1.5/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/UserTransactionImpl.java Wed Feb 11 13:01:45 2009
@@ -29,6 +29,7 @@
import javax.jcr.Session;
import org.apache.jackrabbit.api.XASession;
+import org.apache.jackrabbit.core.state.TimeBomb;
/**
* Internal {@link javax.transaction.UserTransaction} implementation.
@@ -55,6 +56,8 @@
*/
private int status = Status.STATUS_NO_TRANSACTION;
+ private boolean distributedThreadAccess = false;
+
/**
* Create a new instance of this class. Takes a session as parameter.
* @param session session. If session is not of type
@@ -62,8 +65,19 @@
* is thrown
*/
public UserTransactionImpl(Session session) {
+ this(session, false);
+ }
+
+ /**
+ * Create a new instance of this class. Takes a session as parameter.
+ * @param session session. If session is not of type
+ * {@link XASession}, an <code>IllegalArgumentException</code>
+ * is thrown
+ */
+ public UserTransactionImpl(Session session, boolean distributedThreadAccess) {
if (session instanceof XASession) {
xares = ((XASession) session).getXAResource();
+ this.distributedThreadAccess = distributedThreadAccess;
} else {
throw new IllegalArgumentException("Session not of type XASession");
}
@@ -108,7 +122,34 @@
status = Status.STATUS_PREPARED;
status = Status.STATUS_COMMITTING;
- xares.commit(xid, false);
+ if (distributedThreadAccess) {
+ try {
+ final Thread t = Thread.currentThread();
+ final TimeBomb tb = new TimeBomb(100) {
+ public void explode() {
+ t.interrupt();
+ }
+ };
+ tb.arm();
+ Thread distributedThread = new Thread() {
+ public void run() {
+ try {
+ xares.commit(xid, false);
+ tb.disarm();
+ } catch (Exception e) {
+ throw new RuntimeException(e.getMessage());
+ }
+ }
+ };
+ distributedThread.start();
+ Thread.sleep(200);
+ } catch (InterruptedException e) {
+ throw new SystemException("commit from different thread but same XID must not block");
+ }
+ } else {
+ xares.commit(xid, false);
+ }
+
status = Status.STATUS_COMMITTED;
} catch (XAException e) {
@@ -175,7 +216,16 @@
/**
* @see javax.transaction.UserTransaction#setTransactionTimeout
*/
- public void setTransactionTimeout(int seconds) throws SystemException {}
+ public void setTransactionTimeout(int seconds) throws SystemException {
+ try {
+ xares.setTransactionTimeout(seconds);
+ } catch (XAException e) {
+ SystemException se = new SystemException(
+ "Unable to set the TransactionTiomeout: XA_ERR=" + e.errorCode);
+ se.initCause(e.getCause());
+ throw se;
+ }
+ }
/**
Modified: jackrabbit/branches/1.5/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/XATest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/XATest.java?rev=743318&r1=743317&r2=743318&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/XATest.java (original)
+++ jackrabbit/branches/1.5/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/XATest.java Wed Feb 11 13:01:45 2009
@@ -1332,4 +1332,37 @@
// assert: version label known in other session
nOther.getVersionHistory().getVersionByLabel(versionLabel);
}
+
+ /**
+ * Tests two different Threads for prepare and commit in a Transaction
+ */
+ public void testDistributedThreadAccess() throws Exception {
+ // get user transaction object
+ UserTransaction utx = new UserTransactionImpl(superuser, true);
+ //utx.setTransactionTimeout(50);
+ // start transaction
+ utx.begin();
+
+ // add node and save
+ Node n = testRootNode.addNode(nodeName1, testNodeType);
+ n.addMixin(mixReferenceable);
+ testRootNode.save();
+
+ // assertion: node exists in this session
+ try {
+ superuser.getNodeByUUID(n.getUUID());
+ } catch (ItemNotFoundException e) {
+ fail("New node not visible after save()");
+ }
+
+ // commit
+ utx.commit();
+
+ // assertion: node exists in this session
+ try {
+ superuser.getNodeByUUID(n.getUUID());
+ } catch (ItemNotFoundException e) {
+ fail("Committed node not visible in this session");
+ }
+ }
}
Modified: jackrabbit/branches/1.5/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/AbstractISMLockingTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/AbstractISMLockingTest.java?rev=743318&r1=743317&r2=743318&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/AbstractISMLockingTest.java (original)
+++ jackrabbit/branches/1.5/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/AbstractISMLockingTest.java Wed Feb 11 13:01:45 2009
@@ -257,58 +257,4 @@
}
public abstract ISMLocking createISMLocking();
-
- protected static abstract class TimeBomb {
-
- private final boolean[] armed = {false};
-
- private final long millis;
-
- private Thread timer;
-
- public TimeBomb(long millis) {
- this.millis = millis;
- }
-
- public void arm() throws InterruptedException {
- synchronized (armed) {
- if (armed[0]) {
- return;
- } else {
- timer = new Thread(new Runnable() {
- public void run() {
- synchronized (armed) {
- armed[0] = true;
- armed.notify();
- }
- try {
- Thread.sleep(millis);
- explode();
- } catch (InterruptedException e) {
- // disarmed
- }
- }
- });
- timer.start();
- }
- }
- synchronized (armed) {
- while (!armed[0]) {
- armed.wait();
- }
- }
- }
-
- public void disarm() throws InterruptedException {
- synchronized (armed) {
- if (!armed[0]) {
- return;
- }
- }
- timer.interrupt();
- timer.join();
- }
-
- public abstract void explode();
- }
}