From 591cc4cfb8c908556eb6e64811aa7b46fb8bbb7a Mon Sep 17 00:00:00 2001
From: tedyu <yuzhihong@gmail.com>
Date: Fri, 16 Sep 2016 06:57:42 -0700
Subject: [PATCH] HBASE-16349 TestClusterId may hang during cluster shutdown

---
 .../java/org/apache/hadoop/hbase/regionserver/TestClusterId.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestClusterId.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestClusterId.java
index 7b87db86a9c..fbe1f29b6db 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestClusterId.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestClusterId.java
@@ -55,6 +55,7 @@ public class TestClusterId {
 
   @Before
   public void setUp() throws Exception {
+    TEST_UTIL.getConfiguration().setBoolean(ShutdownHook.RUN_SHUTDOWN_HOOK, false);
   }
 
   @After