[hbase] branch master updated: Revert "HBASE-22857 Fix the failed ut TestHRegion and TestHRegionWithInMemoryFlush (#495)"

[zg...@apache.org]

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

zghao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/master by this push:
     new 56980fb  Revert "HBASE-22857 Fix the failed ut TestHRegion and TestHRegionWithInMemoryFlush (#495)"
56980fb is described below

commit 56980fb097494af05805db09b1c2f442d139da81
Author: Guanghao Zhang <zh...@xiaomi.com>
AuthorDate: Wed Aug 28 11:21:29 2019 +0800

    Revert "HBASE-22857 Fix the failed ut TestHRegion and TestHRegionWithInMemoryFlush (#495)"
    
    This reverts commit 0b3db5099c2930a81931793cec1550842371e772.
---
 .../java/org/apache/hadoop/hbase/regionserver/TestHRegion.java     | 7 +++++++
 1 file changed, 7 insertions(+)

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 8da20b6..74ed8a3 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
@@ -1225,7 +1225,14 @@ public class TestHRegion {
     region.close(true);
     wal.close();
 
+    // 2. Test case where START_FLUSH succeeds but COMMIT_FLUSH will throw exception
+    wal.flushActions = new FlushAction [] {FlushAction.COMMIT_FLUSH};
+    wal = new FailAppendFlushMarkerWAL(FileSystem.get(walConf), FSUtils.getRootDir(walConf),
+          method, walConf);
     wal.init();
+    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