Skip to content

Commit

Permalink
GERONIMO-5558 Set commit status directly if no more resources after t…
Browse files Browse the repository at this point in the history 
…he preparing step

git-svn-id: https://svn.apache.org/repos/asf/geronimo/components/txmanager/trunk@990716 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
Haihong Xu committed Aug 30, 2010
1 parent 29849b1 commit afcf0cd
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 47 deletions.
10 changes: 3 additions & 7 deletions geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/CommitTask.java
View file
Expand Up @@ -22,12 +22,8 @@

import java.util.Iterator;
import java.util.List;
import java.util.TimerTask;

import javax.transaction.HeuristicMixedException;
import javax.transaction.HeuristicRollbackException;
import javax.transaction.Status;
import javax.transaction.SystemException;
import javax.transaction.xa.XAException;
import javax.transaction.xa.Xid;

Expand Down Expand Up @@ -63,8 +59,8 @@ public void run() {
synchronized (this) {
status = Status.STATUS_COMMITTING;
}
for (Iterator i = rms.iterator(); i.hasNext();) {
TransactionBranch manager = (TransactionBranch) i.next();
for (Iterator<TransactionBranch> i = rms.iterator(); i.hasNext();) {
TransactionBranch manager = i.next();
try {
try {
manager.getCommitter().commit(manager.getBranchId(), false);
Expand Down Expand Up @@ -108,7 +104,7 @@ public void run() {
}
}
//if all resources were read only, we didn't write a prepare record.
if (rms.isEmpty() && status == Status.STATUS_COMMITTED) {
if (rms.isEmpty()) {
try {
txLog.commit(xid, logMark);
synchronized (this) {
Expand Down
87 changes: 47 additions & 40 deletions ...mo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java
View file
Expand Up @@ -175,7 +175,7 @@ public synchronized boolean enlistResource(XAResource xaRes) throws IllegalState
}

try {
TransactionBranch manager = (TransactionBranch) suspendedXaResources.remove(xaRes);
TransactionBranch manager = suspendedXaResources.remove(xaRes);
if (manager != null) {
//we know about this one, it was suspended
xaRes.start(manager.getBranchId(), XAResource.TMRESUME);
Expand Down Expand Up @@ -230,13 +230,13 @@ public synchronized boolean delistResource(XAResource xaRes, int flag) throws Il
default:
throw new IllegalStateException("Status is " + getStateString(status));
}
TransactionBranch manager = (TransactionBranch) activeXaResources.remove(xaRes);
TransactionBranch manager = activeXaResources.remove(xaRes);
if (manager == null) {
if (flag == XAResource.TMSUSPEND) {
throw new IllegalStateException("trying to suspend an inactive xaresource: " + xaRes);
}
//not active, and we are not trying to suspend. We must be ending tx.
manager = (TransactionBranch) suspendedXaResources.remove(xaRes);
manager = suspendedXaResources.remove(xaRes);
if (manager == null) {
throw new IllegalStateException("Resource not known to transaction: " + xaRes);
}
Expand All @@ -263,7 +263,7 @@ public void commit() throws HeuristicMixedException, HeuristicRollbackException,
if (TransactionTimer.getCurrentTime() > timeout) {
status = Status.STATUS_MARKED_ROLLBACK;
timedout = true;
}
}

if (status == Status.STATUS_MARKED_ROLLBACK) {
rollbackResourcesDuringCommit(resourceManagers, false);
Expand Down Expand Up @@ -299,11 +299,11 @@ public void commit() throws HeuristicMixedException, HeuristicRollbackException,

// one-phase
if (resourceManagers.size() == 1) {
TransactionBranch manager = (TransactionBranch) resourceManagers.getFirst();
TransactionBranch manager = resourceManagers.getFirst();
commitResource(manager);
return;
}
}

boolean willCommit = false;
try {
// two-phase
Expand All @@ -312,12 +312,19 @@ public void commit() throws HeuristicMixedException, HeuristicRollbackException,
rollbackResources(resourceManagers);
throw e;
}

// notify the RMs
if (willCommit) {
//Re-check whether there are still left resourceMangers, as we might remove those Read-Only Resource in the voting process
if (resourceManagers.size() == 0) {
synchronized (this) {
status = Status.STATUS_COMMITTED;
}
return;
}
commitResources(resourceManagers);
} else {
// set everRollback to true here because the rollback here is caused by
// set everRollback to true here because the rollback here is caused by
// XAException during the above internalPrepare
rollbackResourcesDuringCommit(resourceManagers, true);
}
Expand Down Expand Up @@ -418,19 +425,19 @@ private boolean internalPrepare() throws SystemException {
rms.remove();
}
} catch (XAException e) {
if (e.errorCode == XAException.XAER_RMERR
if (e.errorCode == XAException.XAER_RMERR
|| e.errorCode == XAException.XAER_PROTO
|| e.errorCode == XAException.XAER_INVAL) {
throw (SystemException) new SystemException("Error during prepare; transaction was rolled back").initCause(e);
}
synchronized (this) {
status = Status.STATUS_MARKED_ROLLBACK;
/* Per JTA spec, If the resource manager wants to roll back the transaction,
/* Per JTA spec, If the resource manager wants to roll back the transaction,
it should do so by throwing an appropriate XAException in the prepare method.
Also per OTS spec:
The resource can return VoteRollback under any circumstances, including not having
any knowledge about the transaction (which might happen after a crash). If this
response is returned, the transaction must be rolled back. Furthermore, the Transaction
The resource can return VoteRollback under any circumstances, including not having
any knowledge about the transaction (which might happen after a crash). If this
response is returned, the transaction must be rolled back. Furthermore, the Transaction
Service is not required to perform any additional operations on this resource.*/
//rms.remove();
break;
Expand Down Expand Up @@ -593,21 +600,21 @@ private void rollbackResources(List<TransactionBranch> rms) throws SystemExcepti
// let's not set the cause here
log.info("Transaction has been heuristically rolled back " + manager.getCommitter() + "; continuing with rollback", e);
manager.getCommitter().forget(manager.getBranchId());
} else if (e.errorCode == XAException.XA_RBROLLBACK
|| e.errorCode == XAException.XAER_RMERR
} else if (e.errorCode == XAException.XA_RBROLLBACK
|| e.errorCode == XAException.XAER_RMERR
|| e.errorCode == XAException.XAER_NOTA
|| e.errorCode == XAException.XAER_RMFAIL) {
// let's not set the cause here because we expect the transaction to be rolled back eventually
// TODO: for RMFAIL, it means resource unavailable temporarily.
// TODO: for RMFAIL, it means resource unavailable temporarily.
// do we need keep sending request to resource to make sure the roll back completes?
} else if (cause == null) {
cause = new SystemException(e.errorCode);
}
}
}
} catch (XAException e) {
throw (SystemException) new SystemException("Error during rolling back").initCause(e);
}
throw (SystemException) new SystemException("Error during rolling back").initCause(e);
}

synchronized (this) {
status = Status.STATUS_ROLLEDBACK;
Expand Down Expand Up @@ -644,41 +651,41 @@ private void rollbackResourcesDuringCommit(List<TransactionBranch> rms, boolean
log.error("Transaction has been heuristically committed " + manager.getCommitter() + "; continuing with rollback", e);
cause = e;
manager.getCommitter().forget(manager.getBranchId());
} else if (e.errorCode == XAException.XA_RBROLLBACK
} else if (e.errorCode == XAException.XA_RBROLLBACK
|| e.errorCode == XAException.XAER_RMERR
|| e.errorCode == XAException.XAER_NOTA
|| e.errorCode == XAException.XAER_RMFAIL) {
// XAException.XA_RBROLLBACK during commit/rollback, thus RollbackException is expected
// XAException.XAER_RMERR means transaction branch error and transaction has been rolled back
// let's not set the cause here because we expect the transaction to be rolled back eventually
// TODO: for RMFAIL, it means resource unavailable temporarily.
// TODO: for RMFAIL, it means resource unavailable temporarily.
// do we need keep sending request to resource to make sure the roll back completes?
} else if (cause == null) {
cause = e;
}
}
}
} catch (XAException e) {
throw (SystemException) new SystemException("System error during commit/rolling back").initCause(e);
throw (SystemException) new SystemException("System error during commit/rolling back").initCause(e);
}

synchronized (this) {
status = Status.STATUS_ROLLEDBACK;
}

if (cause == null) {
throw (RollbackException) new RollbackException("Unable to commit: transaction marked for rollback").initCause(cause);
} else {
if (cause.errorCode == XAException.XA_HEURCOM && everRolledback) {
throw (HeuristicMixedException) new HeuristicMixedException("HeuristicMixed error during commit/rolling back").initCause(cause);
} else if (cause.errorCode == XAException.XA_HEURMIX) {
throw (HeuristicMixedException) new HeuristicMixedException("HeuristicMixed error during commit/rolling back").initCause(cause);
} else {
} else {
throw (SystemException) new SystemException("System Error during commit/rolling back").initCause(cause);
}
}
}
}

private void commitResource(TransactionBranch manager) throws RollbackException, HeuristicRollbackException, HeuristicMixedException, SystemException{
XAException cause = null;
try {
Expand All @@ -693,7 +700,7 @@ private void commitResource(TransactionBranch manager) throws RollbackException,
synchronized (this) {
status = Status.STATUS_ROLLEDBACK;
}

if (e.errorCode == XAException.XA_HEURRB) {
cause = e;
manager.getCommitter().forget(manager.getBranchId());
Expand All @@ -706,20 +713,20 @@ private void commitResource(TransactionBranch manager) throws RollbackException,
// let's not throw an exception as the transaction has been committed
log.info("Transaction has been heuristically committed");
manager.getCommitter().forget(manager.getBranchId());
} else if (e.errorCode == XAException.XA_RBROLLBACK
|| e.errorCode == XAException.XAER_RMERR
} else if (e.errorCode == XAException.XA_RBROLLBACK
|| e.errorCode == XAException.XAER_RMERR
|| e.errorCode == XAException.XAER_NOTA) {
// Per XA spec, XAException.XAER_RMERR from commit means An error occurred in
// committing the work performed on behalf of the transaction branch
// and the branch's work has been rolled back.
// Per XA spec, XAException.XAER_RMERR from commit means An error occurred in
// committing the work performed on behalf of the transaction branch
// and the branch's work has been rolled back.
// XAException.XAER_NOTA: assume the DB took a unilateral rollback decision and forgot the transaction
log.info("Transaction has been rolled back");
cause = e;
// throw (RollbackException) new RollbackException("Error during one-phase commit").initCause(e);
// throw (RollbackException) new RollbackException("Error during one-phase commit").initCause(e);
} else {
cause = e;
//throw (SystemException) new SystemException("Error during one-phase commit").initCause(e);
}
}
}
} catch (XAException e) {
if (e.errorCode == XAException.XAER_NOTA) {
Expand All @@ -729,22 +736,22 @@ private void commitResource(TransactionBranch manager) throws RollbackException,
throw (SystemException) new SystemException("Error during one phase commit").initCause(e);
}
}

if (cause != null) {
if (cause.errorCode == XAException.XA_HEURRB) {
throw (HeuristicRollbackException) new HeuristicRollbackException("Error during two phase commit").initCause(cause);
} else if (cause.errorCode == XAException.XA_HEURMIX) {
throw (HeuristicMixedException) new HeuristicMixedException("Error during two phase commit").initCause(cause);
} else if (cause.errorCode == XAException.XA_RBROLLBACK
|| cause.errorCode == XAException.XAER_RMERR
} else if (cause.errorCode == XAException.XA_RBROLLBACK
|| cause.errorCode == XAException.XAER_RMERR
|| cause.errorCode == XAException.XAER_NOTA) {
throw (RollbackException) new RollbackException("Error during two phase commit").initCause(cause);
} else {
throw (SystemException) new SystemException("Error during two phase commit").initCause(cause);
}
}
}
}

private void commitResources(List<TransactionBranch> rms) throws HeuristicRollbackException, HeuristicMixedException, SystemException {
CommitTask commitTask = new CommitTask(xid, rms, logMark, retryScheduler, txnLog);
synchronized (this) {
Expand Down

0 comments on commit afcf0cd

Please sign in to comment.