HBASE-7505 Server will hang when stopping cluster, caused by waiting for split threads(Chunhui)

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1430749 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 09:45:21 +00:00 · 2013-01-09 09:45:21 +00:00 · 485cf1a3ce
parent 369b436bff
commit 485cf1a3ce
1 changed files with 3 additions and 0 deletions
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
@ -251,6 +251,9 @@ public class CompactSplitThread implements CompactionRequestor {
      try {
        done = t.awaitTermination(60, TimeUnit.SECONDS);
        LOG.info("Waiting for " + name + " to finish...");
+        if (!done) {
+          t.shutdownNow();
+        }
      } catch (InterruptedException ie) {
        LOG.warn("Interrupted waiting for " + name + " to finish...");
      }