Merge branch 'gerrit/trinity' into 'master'
Change-Id: I498aaaab88da55708a8da7bf98966c9bdfb1699e
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/runtime/SuperActivityOperatorNodePushable.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/runtime/SuperActivityOperatorNodePushable.java
index de28318..4261c1e 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/runtime/SuperActivityOperatorNodePushable.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/runtime/SuperActivityOperatorNodePushable.java
@@ -30,8 +30,10 @@
import java.util.Queue;
import java.util.Set;
import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.CancellationException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
+import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.Semaphore;
import org.apache.commons.collections4.MapUtils;
@@ -255,6 +257,12 @@
}
} catch (ExecutionException e) {
root = e.getCause();
+ } catch (CancellationException | RejectedExecutionException e) {
+ root = e;
+ // if a task has been cancelled or was rejected for execution, the executor has shut down and will no longer
+ // start tasks; adjust the semaphores accordingly to allow cancelTasks() to run without getting blocked.
+ completeSemaphore.release(-startSemaphore.drainPermits() + 1);
+ startSemaphore.release();
} catch (Throwable e) { // NOSONAR: Must catch all causes of failure
root = e;
}