From 9d5582fe24bed2880267848001133748ff0aad22 Mon Sep 17 00:00:00 2001 From: haxiaolin Date: Wed, 28 Aug 2019 11:24:00 +0800 Subject: [PATCH 1/2] HBASE-22896 TestHRegion.testFlushMarkersWALFail is flaky --- .../org/apache/hadoop/hbase/regionserver/TestHRegion.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java index 74ed8a329397..21eb9582c1bc 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java @@ -396,7 +396,6 @@ public void testMemstoreSizeAccountingWithFailedPostBatchMutate() throws IOExcep String testName = "testMemstoreSizeAccountingWithFailedPostBatchMutate"; FileSystem fs = FileSystem.get(CONF); Path rootDir = new Path(dir + testName); - ChunkCreator.initialize(MemStoreLABImpl.CHUNK_SIZE_DEFAULT, false, 0, 0, 0, null); FSHLog hLog = new FSHLog(fs, rootDir, testName, CONF); hLog.init(); region = initHRegion(tableName, null, null, false, Durability.SYNC_WAL, hLog, @@ -1233,10 +1232,10 @@ public long getLength() { this.region = initHRegion(tableName, HConstants.EMPTY_START_ROW, HConstants.EMPTY_END_ROW, false, Durability.USE_DEFAULT, wal, family); region.put(put); - + // 3. Test case where ABORT_FLUSH will throw exception. // Even if ABORT_FLUSH throws exception, we should not fail with IOE, but continue with - // DroppedSnapshotException. Below COMMMIT_FLUSH will cause flush to abort + // DroppedSnapshotException. Below COMMIT_FLUSH will cause flush to abort wal.flushActions = new FlushAction [] {FlushAction.COMMIT_FLUSH, FlushAction.ABORT_FLUSH}; try { @@ -2365,7 +2364,6 @@ public void testDataInMemoryWithoutWAL() throws IOException { hLog.init(); // This chunk creation is done throughout the code base. Do we want to move it into core? // It is missing from this test. W/o it we NPE. - ChunkCreator.initialize(MemStoreLABImpl.CHUNK_SIZE_DEFAULT, false, 0, 0, 0, null); region = initHRegion(tableName, null, null, false, Durability.SYNC_WAL, hLog, COLUMN_FAMILY_BYTES); @@ -4863,7 +4861,6 @@ protected HRegion initHRegion(TableName tableName, byte[] startKey, byte[] stopK String callingMethod, Configuration conf, boolean isReadOnly, byte[]... families) throws IOException { Path logDir = TEST_UTIL.getDataTestDirOnTestFS(callingMethod + ".log"); - ChunkCreator.initialize(MemStoreLABImpl.CHUNK_SIZE_DEFAULT, false, 0, 0, 0, null); HRegionInfo hri = new HRegionInfo(tableName, startKey, stopKey); final WAL wal = HBaseTestingUtility.createWal(conf, logDir, hri); return initHRegion(tableName, startKey, stopKey, isReadOnly, @@ -4876,6 +4873,7 @@ protected HRegion initHRegion(TableName tableName, byte[] startKey, byte[] stopK */ public HRegion initHRegion(TableName tableName, byte[] startKey, byte[] stopKey, boolean isReadOnly, Durability durability, WAL wal, byte[]... families) throws IOException { + ChunkCreator.initialize(MemStoreLABImpl.CHUNK_SIZE_DEFAULT, false, 0, 0, 0, null); return TEST_UTIL.createLocalHRegion(tableName, startKey, stopKey, isReadOnly, durability, wal, families); } From a9b216fb9a40aa826e25924c0d18168b0f55056b Mon Sep 17 00:00:00 2001 From: haxiaolin Date: Thu, 29 Aug 2019 09:47:14 +0800 Subject: [PATCH 2/2] delete blank line --- .../java/org/apache/hadoop/hbase/regionserver/TestHRegion.java | 1 - 1 file changed, 1 deletion(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java index 21eb9582c1bc..034c4b992d06 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java @@ -1232,7 +1232,6 @@ public long getLength() { this.region = initHRegion(tableName, HConstants.EMPTY_START_ROW, HConstants.EMPTY_END_ROW, false, Durability.USE_DEFAULT, wal, family); region.put(put); - // 3. Test case where ABORT_FLUSH will throw exception. // Even if ABORT_FLUSH throws exception, we should not fail with IOE, but continue with // DroppedSnapshotException. Below COMMIT_FLUSH will cause flush to abort