You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2017/11/20 04:23:17 UTC

hbase git commit: HBASE-19288 Intermittent test failure in TestHStore.testRunDoubleMemStoreCompactors

Repository: hbase
Updated Branches:
  refs/heads/master b4fbf5fe1 -> 9b7b83d86


HBASE-19288 Intermittent test failure in TestHStore.testRunDoubleMemStoreCompactors


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9b7b83d8
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9b7b83d8
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9b7b83d8

Branch: refs/heads/master
Commit: 9b7b83d86208c30dbb83ea717e694c5389e71671
Parents: b4fbf5f
Author: tedyu <yu...@gmail.com>
Authored: Sun Nov 19 20:23:12 2017 -0800
Committer: tedyu <yu...@gmail.com>
Committed: Sun Nov 19 20:23:12 2017 -0800

----------------------------------------------------------------------
 .../apache/hadoop/hbase/regionserver/CompactingMemStore.java    | 3 +++
 .../java/org/apache/hadoop/hbase/regionserver/TestHStore.java   | 5 +++++
 2 files changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/9b7b83d8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactingMemStore.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactingMemStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactingMemStore.java
index d250252..f1232f8 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactingMemStore.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactingMemStore.java
@@ -429,6 +429,9 @@ public class CompactingMemStore extends AbstractMemStore {
       }
     } finally {
       inMemoryFlushInProgress.set(false);
+      if (LOG.isDebugEnabled()) {
+        LOG.debug("IN-MEMORY FLUSH: end");
+      }
     }
   }
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/9b7b83d8/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
index 6ec091a..39ed9df 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
@@ -1465,6 +1465,8 @@ public class TestHStore {
     int flushSize = 500;
     Configuration conf = HBaseConfiguration.create();
     conf.set(HStore.MEMSTORE_CLASS_NAME, MyCompactingMemStoreWithCustomCompactor.class.getName());
+    conf.setDouble(CompactingMemStore.IN_MEMORY_FLUSH_THRESHOLD_FACTOR_KEY, 0.25);
+    MyCompactingMemStoreWithCustomCompactor.RUNNER_COUNT.set(0);
     conf.set(HConstants.HREGION_MEMSTORE_FLUSH_SIZE, String.valueOf(flushSize));
     // Set the lower threshold to invoke the "MERGE" policy
     conf.set(MemStoreCompactionStrategy.COMPACTING_MEMSTORE_THRESHOLD_KEY, String.valueOf(0));
@@ -1711,6 +1713,9 @@ public class TestHStore {
       boolean rval = super.shouldFlushInMemory();
       if (rval) {
         RUNNER_COUNT.incrementAndGet();
+        if (LOG.isDebugEnabled()) {
+          LOG.debug("runner count: " + RUNNER_COUNT.get());
+        }
       }
       return rval;
     }