svn commit: r1430749 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java

[zjushch]

Author: zjushch
Date: Wed Jan  9 09:45:21 2013
New Revision: 1430749

URL: http://svn.apache.org/viewvc?rev=1430749&view=rev
Log:
HBASE-7505 Server will hang when stopping cluster, caused by waiting for split 
threads(Chunhui)

Modified:
    
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java

Modified: 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java?rev=1430749&r1=1430748&r2=1430749&view=diff
==============================================================================
--- 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
 (original)
+++ 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
 Wed Jan  9 09:45:21 2013
@@ -251,6 +251,9 @@ public class CompactSplitThread implemen
       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...");
       }