Index: hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFileSystem.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFileSystem.java (revision 1483982) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFileSystem.java (working copy) @@ -30,6 +30,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; +import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.ServerName; @@ -79,6 +80,9 @@ @Test public void testRemoveStaleRecoveringRegionsDuringMasterInitialization() throws Exception { + // this test is for when distributed log replay is enabled + if (!UTIL.getConfiguration().getBoolean(HConstants.DISTRIBUTED_LOG_REPLAY_KEY, false)) return; + LOG.info("Starting testRemoveStaleRecoveringRegionsDuringMasterInitialization"); HMaster master = UTIL.getMiniHBaseCluster().getMaster(); MasterFileSystem fs = master.getMasterFileSystem(); Index: hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java =================================================================== --- hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java (revision 1483982) +++ hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java (working copy) @@ -719,7 +719,7 @@ /** Conf key that enables unflushed WAL edits directly being replayed to region servers */ public static final String DISTRIBUTED_LOG_REPLAY_KEY = "hbase.master.distributed.log.replay"; - public static final boolean DEFAULT_DISTRIBUTED_LOG_REPLAY_CONFIG = true; + public static final boolean DEFAULT_DISTRIBUTED_LOG_REPLAY_CONFIG = false; /** Conf key that specifies timeout value to wait for a region ready */ public static final String LOG_REPLAY_WAIT_REGION_TIMEOUT =