[hbase] branch branch-2.1 updated: HBASE-22896 TestHRegion.testFlushMarkersWALFail is flaky (#551) (#575)

[stack]

This is an automated email from the ASF dual-hosted git repository.

stack pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2.1 by this push:
     new 413c7a4  HBASE-22896 TestHRegion.testFlushMarkersWALFail is flaky 
(#551) (#575)
413c7a4 is described below

commit 413c7a473061fb81051d987e97fbb50c39b14421
Author: linkaline <linkalin...@gmail.com>
AuthorDate: Wed Sep 4 00:54:17 2019 +0800

    HBASE-22896 TestHRegion.testFlushMarkersWALFail is flaky (#551) (#575)
---
 .../test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java | 6 ++----
 1 file changed, 2 insertions(+), 4 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 52ae47e..341eb9b 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
@@ -1254,7 +1254,6 @@ public class TestHRegion {
       } catch (IOException unexpected) {
         throw unexpected;
       }
-
     } finally {
       HBaseTestingUtility.closeRegionAndWAL(this.region);
       this.region = null;
@@ -2490,8 +2489,7 @@ public class TestHRegion {
     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);
-    HRegion region = initHRegion(tableName, null, null, false, 
Durability.SYNC_WAL, hLog,
+    region = initHRegion(tableName, null, null, false, Durability.SYNC_WAL, 
hLog,
         COLUMN_FAMILY_BYTES);
 
     Cell originalCell = CellUtil.createCell(row, COLUMN_FAMILY_BYTES, qual1,
@@ -5104,7 +5102,6 @@ public class TestHRegion {
       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,
@@ -5117,6 +5114,7 @@ public class TestHRegion {
    */
   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);
   }