You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jx...@apache.org on 2014/09/12 20:16:41 UTC
git commit: HBASE-11959 TestAssignmentManagerOnCluster is flaky
Repository: hbase
Updated Branches:
refs/heads/branch-1 d666a8a4c -> e469466cf
HBASE-11959 TestAssignmentManagerOnCluster is flaky
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e469466c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e469466c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e469466c
Branch: refs/heads/branch-1
Commit: e469466cf1494fe50eb9efefadba6f6ccda6138c
Parents: d666a8a
Author: Jimmy Xiang <jx...@cloudera.com>
Authored: Fri Sep 12 09:17:02 2014 -0700
Committer: Jimmy Xiang <jx...@cloudera.com>
Committed: Fri Sep 12 11:16:10 2014 -0700
----------------------------------------------------------------------
.../apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java | 2 ++
.../java/org/apache/hadoop/hbase/master/TestZKLessAMOnCluster.java | 2 --
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/e469466c/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java
----------------------------------------------------------------------
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 1c156a3..4bca1ce 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();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e469466c/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestZKLessAMOnCluster.java
----------------------------------------------------------------------
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 6eb273a..83d33c5 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();