Repository: hbase Updated Branches: refs/heads/branch-1.0 bc464cc74 -> a32f485fe
Revert "HBASE-12746 [1.0.0RC0] Distributed Log Replay is on (HBASE-12577 was insufficient) (Jeffrey Zhong)" Overcommitted. Reverting so can apply intended patch This reverts commit 2df74fbd4a85de1e5325ba6ad8595f2081238e29. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d5f63f12 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d5f63f12 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d5f63f12 Branch: refs/heads/branch-1.0 Commit: d5f63f122131a45b24b5e3839d4b59a578652b2d Parents: bc464cc Author: stack <[email protected]> Authored: Sat Jan 3 10:59:58 2015 -0800 Committer: stack <[email protected]> Committed: Sat Jan 3 10:59:58 2015 -0800 ---------------------------------------------------------------------- hbase-common/src/main/resources/hbase-default.xml | 11 +++++++---- .../org/apache/hadoop/hbase/master/MasterFileSystem.java | 5 ----- .../apache/hadoop/hbase/master/TestSplitLogManager.java | 1 - 3 files changed, 7 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/d5f63f12/hbase-common/src/main/resources/hbase-default.xml ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml index 04facc0..79d7430 100644 --- a/hbase-common/src/main/resources/hbase-default.xml +++ b/hbase-common/src/main/resources/hbase-default.xml @@ -274,10 +274,13 @@ possible configurations would overwhelm and obscure the important. </property> <property> <name>hbase.master.distributed.log.replay</name> - <value>false</value> - <description>True to enable 'distributed log replay' as default engine splitting - WAL files on server crash. 'Disributed log replay' improves MTTR because it does not - write intermediate files. + <value>true</value> + <description>Enable 'distributed log replay' as default engine splitting + WAL files on server crash. This default is new in hbase 1.0. To fall + back to the old mode 'distributed log splitter', set the value to + 'false'. 'Disributed log replay' improves MTTR because it does not + write intermediate files. 'DLR' required that 'hfile.format.version' + be set to version 3 or higher. </description> </property> <property> http://git-wip-us.apache.org/repos/asf/hbase/blob/d5f63f12/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java index 93bde36..7650b94 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java @@ -237,11 +237,6 @@ public class MasterFileSystem { return serverNames; } for (FileStatus status : logFolders) { - FileStatus[] curLogFiles = FSUtils.listStatus(this.fs, status.getPath(), null); - if (curLogFiles == null || curLogFiles.length == 0) { - // Empty log folder. No recovery needed - continue; - } final ServerName serverName = DefaultWALProvider.getServerNameFromWALDirectoryName( status.getPath()); if (null == serverName) { http://git-wip-us.apache.org/repos/asf/hbase/blob/d5f63f12/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 80fb7bf..f6a7953 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 @@ -639,7 +639,6 @@ public class TestSplitLogManager { SplitLogCounters.resetCounters(); Configuration testConf = HBaseConfiguration.create(TEST_UTIL.getConfiguration()); testConf.setBoolean(HConstants.DISTRIBUTED_LOG_REPLAY_KEY, true); - ds = new DummyServer(zkw, testConf); zkw.getRecoverableZooKeeper().create(ZKSplitLog.getEncodedNodeName(zkw, "testRecovery"), new SplitLogTask.Unassigned(
