opendev/gerrit
Code Issues Proposed changes

Merge "Add runnable that gets notified that it was canceled while running"

Browse Source
This commit is contained in:
Hugo Arès 2016-06-21 12:45:00 +00:00 committed by Gerrit Code Review
commit 95c7ba627e
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java
View File

@ -240,12 +240,29 @@ public class WorkQueue {
}
}
/** Runnable needing to know it was canceled. */
/**
* Runnable needing to know it was canceled.
* Note that cancel is called only in case the task is not in
* progress already.
*/
public interface CancelableRunnable extends Runnable {
/** Notifies the runnable it was canceled. */
void cancel();
}
/**
* Base interface handles the case when task was canceled before
* actual execution and in case it was started cancel method is
* not called yet the task itself will be destroyed anyway (it
* will result in resource opening errors).
* This interface gives a chance to implementing classes for
* handling such scenario and act accordingly.
*/
public interface CanceledWhileRunning extends CancelableRunnable {
/** Notifies the runnable it was canceled during execution. **/
void setCanceledWhileRunning();
}
/** A wrapper around a scheduled Runnable, as maintained in the queue. */
public static class Task<V> implements RunnableScheduledFuture<V> {
/**
@ -317,9 +334,12 @@ public class WorkQueue {
// as running and allow it to clean up. This ensures we do
// not invoke cancel twice.
//
if (runnable instanceof CancelableRunnable
&& running.compareAndSet(false, true)) {
((CancelableRunnable) runnable).cancel();
if (runnable instanceof CancelableRunnable) {
if (running.compareAndSet(false, true)) {
((CancelableRunnable) runnable).cancel();
} else if (runnable instanceof CanceledWhileRunning) {
((CanceledWhileRunning) runnable).setCanceledWhileRunning();
}
}
executor.remove(this);
executor.purge();