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

This reverts commit 4640ff5959.
This commit is contained in:
Sergey Shelukhin 2018-12-13 12:46:39 -08:00
parent cb1966dc2d
commit 9a25d0c249
1 changed files with 2 additions and 6 deletions

View File

@ -703,7 +703,6 @@ class MemStoreFlusher implements FlushRequester {
if (flushType != FlushType.NORMAL) { if (flushType != FlushType.NORMAL) {
TraceUtil.addTimelineAnnotation("Force Flush. We're above high water mark."); TraceUtil.addTimelineAnnotation("Force Flush. We're above high water mark.");
long start = EnvironmentEdgeManager.currentTime(); long start = EnvironmentEdgeManager.currentTime();
long nextLogTimeMs = start;
synchronized (this.blockSignal) { synchronized (this.blockSignal) {
boolean blocked = false; boolean blocked = false;
long startTime = 0; long startTime = 0;
@ -745,11 +744,8 @@ class MemStoreFlusher implements FlushRequester {
LOG.warn("Interrupted while waiting"); LOG.warn("Interrupted while waiting");
interrupted = true; interrupted = true;
} }
long nowMs = EnvironmentEdgeManager.currentTime(); long took = EnvironmentEdgeManager.currentTime() - start;
if (nowMs >= nextLogTimeMs) { LOG.warn("Memstore is above high water mark and block " + took + "ms");
LOG.warn("Memstore is above high water mark and block {} ms", nowMs - start);
nextLogTimeMs = nowMs + 1000;
}
flushType = isAboveHighWaterMark(); flushType = isAboveHighWaterMark();
} }
} finally { } finally {