You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2015/05/02 16:12:38 UTC
hbase git commit: HBASE-13607
TestSplitLogManager.testGetPreviousRecoveryMode consistently failing (Josh
Elser)
Repository: hbase
Updated Branches:
refs/heads/branch-1 9a4ea44d1 -> e13ca3c61
HBASE-13607 TestSplitLogManager.testGetPreviousRecoveryMode consistently failing (Josh Elser)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e13ca3c6
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e13ca3c6
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e13ca3c6
Branch: refs/heads/branch-1
Commit: e13ca3c61bc7bb5e2920ba706707716069cc5453
Parents: 9a4ea44
Author: tedyu <yu...@gmail.com>
Authored: Sat May 2 07:12:57 2015 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Sat May 2 07:12:57 2015 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/master/TestSplitLogManager.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/e13ca3c6/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
index c065a59..5b684e4 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
@@ -49,7 +49,6 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.ChoreService;
import org.apache.hadoop.hbase.CoordinatedStateManager;
import org.apache.hadoop.hbase.CoordinatedStateManagerFactory;
-import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionInfo;
@@ -643,15 +642,16 @@ public class TestSplitLogManager {
public void testGetPreviousRecoveryMode() throws Exception {
LOG.info("testGetPreviousRecoveryMode");
SplitLogCounters.resetCounters();
- Configuration testConf = HBaseConfiguration.create(TEST_UTIL.getConfiguration());
- testConf.setBoolean(HConstants.DISTRIBUTED_LOG_REPLAY_KEY, true);
+ // Not actually enabling DLR for the cluster, just for the ZkCoordinatedStateManager to use.
+ // The test is just manipulating ZK manually anyways.
+ conf.setBoolean(HConstants.DISTRIBUTED_LOG_REPLAY_KEY, true);
zkw.getRecoverableZooKeeper().create(ZKSplitLog.getEncodedNodeName(zkw, "testRecovery"),
new SplitLogTask.Unassigned(
ServerName.valueOf("mgr,1,1"), RecoveryMode.LOG_SPLITTING).toByteArray(),
Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
- slm = new SplitLogManager(ds, testConf, stopper, master, DUMMY_MASTER);
+ slm = new SplitLogManager(ds, conf, stopper, master, DUMMY_MASTER);
LOG.info("Mode1=" + slm.getRecoveryMode());
assertTrue(slm.isLogSplitting());
zkw.getRecoverableZooKeeper().delete(ZKSplitLog.getEncodedNodeName(zkw, "testRecovery"), -1);