HBASE-1129 Master won't go down; stuck joined on rootScanner

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@735911 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -4,6 +4,7 @@ Release 0.20.0 - Unreleased
 
   BUG FIXES
    HBASE-1140  "ant clean test" fails (Nitay Joffe via Stack)
+   HBASE-1129  Master won't go down; stuck joined on rootScanner
 
   IMPROVEMENTS
    HBASE-1089  Add count of regions on filesystem to master UI; add percentage

src/java/org/apache/hadoop/hbase/Chore.java

@@ -55,14 +55,15 @@ public abstract class Chore extends Thread {
   @Override
   public void run() {
     try {
-      while (!initialChore()) {
-        this.sleeper.sleep();
-      }
-      this.sleeper.sleep();
+      boolean initialChoreComplete = false;
       while (!this.stop.get()) {
         long startTime = System.currentTimeMillis();
         try {
-          chore();
+          if (!initialChoreComplete) {
+            initialChoreComplete = initialChore();
+          } else {
+            chore();
+          }
         } catch (Exception e) {
           LOG.error("Caught exception", e);
           if (this.stop.get()) {