From e469466cf1494fe50eb9efefadba6f6ccda6138c Mon Sep 17 00:00:00 2001 From: Jimmy Xiang Date: Fri, 12 Sep 2014 09:17:02 -0700 Subject: [PATCH] HBASE-11959 TestAssignmentManagerOnCluster is flaky --- .../hadoop/hbase/master/TestAssignmentManagerOnCluster.java | 2 ++ .../org/apache/hadoop/hbase/master/TestZKLessAMOnCluster.java | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) 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 1c156a35918..4bca1ce818f 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 @@ -96,6 +96,8 @@ public class TestAssignmentManagerOnCluster { MyRegionObserver.class, RegionObserver.class); // Reduce the maximum attempts to speed up the test conf.setInt("hbase.assignment.maximum.attempts", 3); + // Put meta on master to avoid meta server shutdown handling + conf.set("hbase.balancer.tablesOnMaster", "hbase:meta"); TEST_UTIL.startMiniCluster(1, 4, null, MyMaster.class, MyRegionServer.class); admin = TEST_UTIL.getHBaseAdmin(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestZKLessAMOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestZKLessAMOnCluster.java index 6eb273a46b0..83d33c55bb6 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestZKLessAMOnCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestZKLessAMOnCluster.java @@ -30,8 +30,6 @@ public class TestZKLessAMOnCluster extends TestAssignmentManagerOnCluster { @BeforeClass public static void setUpBeforeClass() throws Exception { - // Put meta on master to avoid meta server shutdown handling - conf.set("hbase.balancer.tablesOnMaster", "hbase:meta"); // Don't use ZK for region assignment conf.setBoolean("hbase.assignment.usezk", false); setupOnce();