Revert "HIVE-21575 : memstore above high watermark message is logged too much"
This reverts commit 4640ff5959af4865966126a503a7cd15e26a7408. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9a25d0c2 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9a25d0c2 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9a25d0c2 Branch: refs/heads/HBASE-21512 Commit: 9a25d0c249e595a1f8aef41cd677b44ff1c72d73 Parents: cb1966d Author: Sergey Shelukhin <ser...@apache.org> Authored: Thu Dec 13 12:46:39 2018 -0800 Committer: Sergey Shelukhin <ser...@apache.org> Committed: Thu Dec 13 12:46:39 2018 -0800 ---------------------------------------------------------------------- .../apache/hadoop/hbase/regionserver/MemStoreFlusher.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/9a25d0c2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java ---------------------------------------------------------------------- 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 index 804a2f8..699c9b6 100644 --- 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 @@ class MemStoreFlusher implements FlushRequester { 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 @@ class MemStoreFlusher implements FlushRequester { 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 {