Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[AMQ-8400] Add synchronization handling for Transaction to prevent CME (#720)

This commit is contained in:
Matt Pavlovich 2021-12-20 08:37:56 -06:00 committed by GitHub
parent ee768a28d6
commit b196e9a88a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
activemq-broker/src/main/java/org/apache/activemq/transaction/Transaction.java
View File

@ -52,15 +52,15 @@ public abstract class Transaction {
public Object call() throws Exception {
doPreCommit();
return null;
}
}
});
protected FutureTask<?> postCommitTask = new FutureTask<Object>(new Callable<Object>() {
public Object call() throws Exception {
doPostCommit();
return null;
}
}
});
public byte getState() {
return state;
}
@ -87,15 +87,19 @@ public abstract class Transaction {
}
public Synchronization findMatching(Synchronization r) {
int existing = synchronizations.indexOf(r);
if (existing != -1) {
return synchronizations.get(existing);
}
synchronized(synchronizations) {
int existing = synchronizations.indexOf(r);
if (existing != -1) {
return synchronizations.get(existing);
}
}
return null;
}
public void removeSynchronization(Synchronization r) {
synchronizations.remove(r);
synchronized(synchronizations) {
synchronizations.remove(r);
}
}
public void prePrepare() throws Exception {
@ -119,26 +123,32 @@ public abstract class Transaction {
throw xae;
}
}
protected void fireBeforeCommit() throws Exception {
for (Iterator<Synchronization> iter = synchronizations.iterator(); iter.hasNext();) {
Synchronization s = iter.next();
s.beforeCommit();
synchronized(synchronizations) {
for (Iterator<Synchronization> iter = synchronizations.iterator(); iter.hasNext();) {
Synchronization s = iter.next();
s.beforeCommit();
}
}
}
protected void fireAfterCommit() throws Exception {
for (Iterator<Synchronization> iter = synchronizations.iterator(); iter.hasNext();) {
Synchronization s = iter.next();
s.afterCommit();
synchronized(synchronizations) {
for (Iterator<Synchronization> iter = synchronizations.iterator(); iter.hasNext();) {
Synchronization s = iter.next();
s.afterCommit();
}
}
}
public void fireAfterRollback() throws Exception {
Collections.reverse(synchronizations);
for (Iterator<Synchronization> iter = synchronizations.iterator(); iter.hasNext();) {
Synchronization s = iter.next();
s.afterRollback();
synchronized(synchronizations) {
Collections.reverse(synchronizations);
for (Iterator<Synchronization> iter = synchronizations.iterator(); iter.hasNext();) {
Synchronization s = iter.next();
s.afterRollback();
}
}
}
@ -156,15 +166,15 @@ public abstract class Transaction {
public abstract TransactionId getTransactionId();
public abstract Logger getLog();
public boolean isPrepared() {
return getState() == PREPARED_STATE;
}
public int size() {
return synchronizations.size();
}
protected void waitPostCommitDone(FutureTask<?> postCommitTask) throws XAException, IOException {
try {
postCommitTask.get();
@ -179,9 +189,9 @@ public abstract class Transaction {
} else {
throw new XAException(e.toString());
}
}
}
}
protected void doPreCommit() throws XAException {
try {
fireBeforeCommit();