HBASE-11959 TestAssignmentManagerOnCluster is flaky

This commit is contained in:
Jimmy Xiang 2014-09-12 09:17:02 -07:00
parent d666a8a4cb
commit e469466cf1
2 changed files with 2 additions and 2 deletions

View File

@ -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();

View File

@ -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();