HBASE-16846 Procedure v2 - executor cleanup

apache · Oct 17, 2016 · c6e9dab · c6e9dab
1 parent c8e9a29
commit c6e9dab
Show file tree

Hide file tree

Showing 14 changed files with 1,330 additions and 607 deletions.
diff --git a/...rocedure/src/main/java/org/apache/hadoop/hbase/procedure2/AbstractProcedureScheduler.java b/...rocedure/src/main/java/org/apache/hadoop/hbase/procedure2/AbstractProcedureScheduler.java
@@ -20,7 +20,6 @@
 
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.logging.Log;
@@ -123,17 +122,26 @@ public Procedure poll(long timeout, TimeUnit unit) {
     return poll(unit.toNanos(timeout));
   }
 
-  public Procedure poll(long nanos) {
+  @edu.umd.cs.findbugs.annotations.SuppressWarnings("WA_AWAIT_NOT_IN_LOOP")
-    final boolean waitForever = (nanos < 0);
+  public Procedure poll(final long nanos) {
     schedLock();
     try {
-      while (!queueHasRunnables()) {
+      if (!running) {
-        if (!running) return null;
+        LOG.debug("the scheduler is not running");
-        if (waitForever) {
+        return null;
+      }
+
+      if (!queueHasRunnables()) {
+        // WA_AWAIT_NOT_IN_LOOP: we are not in a loop because we want the caller
+        // to take decisions after a wake/interruption.
+        if (nanos < 0) {
           schedWaitCond.await();
         } else {
-          if (nanos <= 0) return null;
+          schedWaitCond.awaitNanos(nanos);
-          nanos = schedWaitCond.awaitNanos(nanos);
+        }
+        if (!queueHasRunnables()) {
+          nullPollCalls++;
+          return null;
         }
       }