Skip to content

Commit 693fa05

Browse files
sunhellysaintstack
authored andcommitted
HBASE-22896 TestHRegion.testFlushMarkersWALFail is flaky (#551)
* HBASE-22896 TestHRegion.testFlushMarkersWALFail is flaky * delete blank line
1 parent 13b2edc commit 693fa05

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,6 @@ public void testMemstoreSizeAccountingWithFailedPostBatchMutate() throws IOExcep
396396
String testName = "testMemstoreSizeAccountingWithFailedPostBatchMutate";
397397
FileSystem fs = FileSystem.get(CONF);
398398
Path rootDir = new Path(dir + testName);
399-
ChunkCreator.initialize(MemStoreLABImpl.CHUNK_SIZE_DEFAULT, false, 0, 0, 0, null);
400399
FSHLog hLog = new FSHLog(fs, rootDir, testName, CONF);
401400
hLog.init();
402401
region = initHRegion(tableName, null, null, false, Durability.SYNC_WAL, hLog,
@@ -1233,10 +1232,9 @@ public long getLength() {
12331232
this.region = initHRegion(tableName, HConstants.EMPTY_START_ROW,
12341233
HConstants.EMPTY_END_ROW, false, Durability.USE_DEFAULT, wal, family);
12351234
region.put(put);
1236-
12371235
// 3. Test case where ABORT_FLUSH will throw exception.
12381236
// Even if ABORT_FLUSH throws exception, we should not fail with IOE, but continue with
1239-
// DroppedSnapshotException. Below COMMMIT_FLUSH will cause flush to abort
1237+
// DroppedSnapshotException. Below COMMIT_FLUSH will cause flush to abort
12401238
wal.flushActions = new FlushAction [] {FlushAction.COMMIT_FLUSH, FlushAction.ABORT_FLUSH};
12411239

12421240
try {
@@ -2365,7 +2363,6 @@ public void testDataInMemoryWithoutWAL() throws IOException {
23652363
hLog.init();
23662364
// This chunk creation is done throughout the code base. Do we want to move it into core?
23672365
// It is missing from this test. W/o it we NPE.
2368-
ChunkCreator.initialize(MemStoreLABImpl.CHUNK_SIZE_DEFAULT, false, 0, 0, 0, null);
23692366
region = initHRegion(tableName, null, null, false, Durability.SYNC_WAL, hLog,
23702367
COLUMN_FAMILY_BYTES);
23712368

@@ -4863,7 +4860,6 @@ protected HRegion initHRegion(TableName tableName, byte[] startKey, byte[] stopK
48634860
String callingMethod, Configuration conf, boolean isReadOnly, byte[]... families)
48644861
throws IOException {
48654862
Path logDir = TEST_UTIL.getDataTestDirOnTestFS(callingMethod + ".log");
4866-
ChunkCreator.initialize(MemStoreLABImpl.CHUNK_SIZE_DEFAULT, false, 0, 0, 0, null);
48674863
HRegionInfo hri = new HRegionInfo(tableName, startKey, stopKey);
48684864
final WAL wal = HBaseTestingUtility.createWal(conf, logDir, hri);
48694865
return initHRegion(tableName, startKey, stopKey, isReadOnly,
@@ -4876,6 +4872,7 @@ protected HRegion initHRegion(TableName tableName, byte[] startKey, byte[] stopK
48764872
*/
48774873
public HRegion initHRegion(TableName tableName, byte[] startKey, byte[] stopKey,
48784874
boolean isReadOnly, Durability durability, WAL wal, byte[]... families) throws IOException {
4875+
ChunkCreator.initialize(MemStoreLABImpl.CHUNK_SIZE_DEFAULT, false, 0, 0, 0, null);
48794876
return TEST_UTIL.createLocalHRegion(tableName, startKey, stopKey,
48804877
isReadOnly, durability, wal, families);
48814878
}

0 commit comments

Comments
 (0)