Repository: hbase Updated Branches: refs/heads/0.94 cce7a9770 -> e127626d3
HBASE-11641 TestDistributedLogSplitting.testMasterStartsUpWithLogSplittingWork fails frequently. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e127626d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e127626d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e127626d Branch: refs/heads/0.94 Commit: e127626d3bfcf647910086f809cbdae2afacb1e5 Parents: cce7a97 Author: Lars Hofhansl <[email protected]> Authored: Tue Aug 5 10:33:36 2014 -0700 Committer: Lars Hofhansl <[email protected]> Committed: Tue Aug 5 10:33:36 2014 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hbase/master/TestDistributedLogSplitting.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/e127626d/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java b/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java index d397b64..d4237fc 100644 --- a/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java +++ b/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java @@ -132,11 +132,10 @@ public class TestDistributedLogSplitting { conf.getLong("hbase.splitlog.max.resubmit", 0); // Make the failure test faster conf.setInt("zookeeper.recovery.retry", 0); - TEST_UTIL.shutdownMiniHBaseCluster(); TEST_UTIL = new HBaseTestingUtility(conf); TEST_UTIL.setDFSCluster(dfsCluster); TEST_UTIL.setZkCluster(zkCluster); - TEST_UTIL.startMiniHBaseCluster(NUM_MASTERS, num_rs); + TEST_UTIL.startMiniHBaseCluster(num_master, num_rs); cluster = TEST_UTIL.getHBaseCluster(); LOG.info("Waiting for active/ready master"); cluster.waitForActiveAndReadyMaster();
