Revert "HIVE-21575 : memstore above high watermark message is logged …

…too much" This reverts commit 4640ff5.
hugegraph · Dec 13, 2018 · 9a25d0c · 9a25d0c
1 parent cb1966d
commit 9a25d0c
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
@@ -703,7 +703,6 @@ public void reclaimMemStoreMemory() {
     if (flushType != FlushType.NORMAL) {
       TraceUtil.addTimelineAnnotation("Force Flush. We're above high water mark.");
       long start = EnvironmentEdgeManager.currentTime();
-      long nextLogTimeMs = start;
       synchronized (this.blockSignal) {
         boolean blocked = false;
         long startTime = 0;
@@ -745,11 +744,8 @@ public void reclaimMemStoreMemory() {
               LOG.warn("Interrupted while waiting");
               interrupted = true;
             }
-            long nowMs = EnvironmentEdgeManager.currentTime();
-            if (nowMs >= nextLogTimeMs) {
-              LOG.warn("Memstore is above high water mark and block {} ms", nowMs - start);
-              nextLogTimeMs = nowMs + 1000;
-            }
+            long took = EnvironmentEdgeManager.currentTime() - start;
+            LOG.warn("Memstore is above high water mark and block " + took + "ms");
             flushType = isAboveHighWaterMark();
           }
         } finally {