From 485cf1a3ce2c29e5e6206df572a30bb16fc416c5 Mon Sep 17 00:00:00 2001 From: zjushch Date: Wed, 9 Jan 2013 09:45:21 +0000 Subject: [PATCH] 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 --- .../apache/hadoop/hbase/regionserver/CompactSplitThread.java | 3 +++ 1 file changed, 3 insertions(+) diff --git 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 index b28023ab2ae..d601aee32aa 100644 --- 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..."); }