diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AsyncFSWAL.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AsyncFSWAL.java index 832eefd559..229c8eb199 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AsyncFSWAL.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AsyncFSWAL.java @@ -147,7 +147,7 @@ public class AsyncFSWAL extends AbstractFSWAL { public static final String ASYNC_WAL_USE_SHARED_EVENT_LOOP = "hbase.wal.async.use-shared-event-loop"; - public static final boolean DEFAULT_ASYNC_WAL_USE_SHARED_EVENT_LOOP = true; + public static final boolean DEFAULT_ASYNC_WAL_USE_SHARED_EVENT_LOOP = false; private final EventLoopGroup eventLoopGroup; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALFactory.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALFactory.java index efb8e2d034..5855419683 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALFactory.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALFactory.java @@ -73,7 +73,7 @@ public class WALFactory implements WALFileLengthProvider { * Maps between configuration names for providers and implementation classes. */ static enum Providers { - defaultProvider(FSHLogProvider.class), + defaultProvider(AsyncFSWALProvider.class), filesystem(FSHLogProvider.class), multiwal(RegionGroupingProvider.class), asyncfs(AsyncFSWALProvider.class); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALOpenAfterDNRollingStart.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALOpenAfterDNRollingStart.java index cf2c5d7e32..d42b2f512e 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALOpenAfterDNRollingStart.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALOpenAfterDNRollingStart.java @@ -24,6 +24,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.regionserver.HRegionServer; +import org.apache.hadoop.hbase.regionserver.wal.AbstractFSWAL; import org.apache.hadoop.hbase.regionserver.wal.FSHLog; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.FSUtils; @@ -67,7 +68,7 @@ public class TestWALOpenAfterDNRollingStart { @Test(timeout = 300000) public void test() throws Exception { HRegionServer server = TEST_UTIL.getHBaseCluster().getRegionServer(0); - FSHLog hlog = (FSHLog)server.getWAL(null); + AbstractFSWAL hlog = (AbstractFSWAL)server.getWAL(null); Path currentFile = hlog.getCurrentFileName(); //restart every dn to simulate a dn rolling upgrade for(int i = 0; i < TEST_UTIL.getDFSCluster().getDataNodes().size(); i++) { @@ -87,8 +88,5 @@ public class TestWALOpenAfterDNRollingStart { //if the log is not rolled, then we can never open this wal forever. WAL.Reader reader = WALFactory .createReader(TEST_UTIL.getTestFileSystem(), currentFile, TEST_UTIL.getConfiguration()); - } - - }