From a16b4e0fd5d582a14b78695b2a1acb1135d8fc53 Mon Sep 17 00:00:00 2001
From: Enis Soztutar <enis@apache.org>
Date: Thu, 20 Nov 2014 16:17:06 -0800
Subject: [PATCH] HBASE-12549 Fix
 TestAssignmentManagerOnCluster#testAssignRacingWithSSH() flaky test

---
 .../hadoop/hbase/master/TestAssignmentManagerOnCluster.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java
index 27c7073cd2e..e6d08b976c3 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java
@@ -260,6 +260,12 @@ public class TestAssignmentManagerOnCluster {
       }
 
       TEST_UTIL.deleteTable(Bytes.toBytes(table));
+
+      // reset the value for other tests
+      TEST_UTIL.getMiniHBaseCluster().getConf().setInt("hbase.assignment.maximum.attempts", 3);
+      ServerName masterServerName = TEST_UTIL.getMiniHBaseCluster().getMaster().getServerName();
+      TEST_UTIL.getMiniHBaseCluster().stopMaster(masterServerName);
+      TEST_UTIL.getMiniHBaseCluster().startMaster();
     }
   }