keith-turner commented on a change in pull request #2467:
URL: https://github.com/apache/accumulo/pull/2467#discussion_r801197041
##########
File path: core/src/main/java/org/apache/accumulo/fate/Fate.java
##########
@@ -71,24 +83,51 @@ public void run() {
try {
tid = store.reserve();
TStatus status = store.getStatus(tid);
+ if (status == FAILED) {
+ runnerLog.info(
+ "FATE txid " + Long.toHexString(tid) + " likely cancelled
before it started.");
+ return;
+ }
Repo<T> op = store.top(tid);
- if (status == TStatus.FAILED_IN_PROGRESS) {
+ if (status == FAILED_IN_PROGRESS) {
processFailed(tid, op);
} else {
Repo<T> prevOp = null;
+ boolean ieSeen = false;
try {
- deferTime = op.isReady(tid, environment);
-
- if (deferTime == 0) {
- prevOp = op;
- if (status == TStatus.SUBMITTED) {
- store.setStatus(tid, TStatus.IN_PROGRESS);
+ try {
+ synchronized (RUNNING_TRANSACTIONS) {
+ RUNNING_TRANSACTIONS.put(tid, Thread.currentThread());
}
- op = op.call(tid, environment);
- } else
- continue;
-
+ deferTime = op.isReady(tid, environment);
+ if (deferTime == 0) {
+ prevOp = op;
+ if (status == SUBMITTED) {
+ store.setStatus(tid, IN_PROGRESS);
+ }
+ op = op.call(tid, environment);
+ } else
+ continue;
+ } catch (InterruptedException ie) {
+ ieSeen = true;
+ throw ie;
+ } finally {
+ synchronized (RUNNING_TRANSACTIONS) {
+ RUNNING_TRANSACTIONS.remove(tid);
+ }
+ // It's possible that cancel was called between
+ // op.call and the synchronized block above. Do a last
+ // check to see if that's the case.
+ if (!ieSeen && Thread.currentThread().isInterrupted()) {
+ throw new InterruptedException("FaTE thread was
interrupted");
+ }
Review comment:
If there is any exception on the try{} block then we probably do not
want to throw anything in the finally block as it will obscure the original
exception. Generalizing the code as follows may avoid this problem.
```suggestion
} catch (Exception e) {
eSeen = true;
throw e;
} finally {
synchronized (RUNNING_TRANSACTIONS) {
RUNNING_TRANSACTIONS.remove(tid);
}
// It's possible that cancel was called between
// op.call and the synchronized block above. Do a last
// check to see if that's the case.
if (!eSeen && Thread.currentThread().isInterrupted()) {
throw new InterruptedException("FaTE thread was
interrupted");
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
