hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject hbase git commit: HBASE-13607 TestSplitLogManager.testGetPreviousRecoveryMode consistently failing (Josh Elser)
Date Sat, 02 May 2015 14:13:18 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.1 9acaba276 -> 49ab39d40


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/49ab39d4
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/49ab39d4
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/49ab39d4

Branch: refs/heads/branch-1.1
Commit: 49ab39d404ae15005ce52d5f8054fc60b7c362d9
Parents: 9acaba2
Author: tedyu <yuzhihong@gmail.com>
Authored: Sat May 2 07:13:43 2015 -0700
Committer: tedyu <yuzhihong@gmail.com>
Committed: Sat May 2 07:13:43 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/49ab39d4/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);


Mime
View raw message