From f41d899b56a00cf59977d7bc0040178b4f2b2d67 Mon Sep 17 00:00:00 2001 From: xcang Date: Sun, 23 Sep 2018 23:34:34 -0700 Subject: [PATCH] HBASE-18451 PeriodicMemstoreFlusher should inspect the queue before adding a delayed flush request --- .../org/apache/hadoop/hbase/regionserver/FlushRequester.java | 6 ++++-- .../org/apache/hadoop/hbase/regionserver/HRegionServer.java | 11 ++++++----- .../org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java | 8 ++++++-- .../hadoop/hbase/regionserver/TestHeapMemoryManager.java | 7 ++++--- .../hadoop/hbase/regionserver/wal/AbstractTestWALReplay.java | 6 ++++-- 5 files changed, 24 insertions(+), 14 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/FlushRequester.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/FlushRequester.java index c54f771395..4191fbfb6b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/FlushRequester.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/FlushRequester.java @@ -32,8 +32,9 @@ public interface FlushRequester { * @param region the Region requesting the cache flush * @param forceFlushAllStores whether we want to flush all stores. e.g., when request from log * rolling. + * @return true if our region is added into the queue, false otherwise */ - void requestFlush(HRegion region, boolean forceFlushAllStores, FlushLifeCycleTracker tracker); + boolean requestFlush(HRegion region, boolean forceFlushAllStores, FlushLifeCycleTracker tracker); /** * Tell the listener the cache needs to be flushed after a delay @@ -42,8 +43,9 @@ public interface FlushRequester { * @param delay after how much time should the flush happen * @param forceFlushAllStores whether we want to flush all stores. e.g., when request from log * rolling. + * @return true if our region is added into the queue, false otherwise */ - void requestDelayedFlush(HRegion region, long delay, boolean forceFlushAllStores); + boolean requestDelayedFlush(HRegion region, long delay, boolean forceFlushAllStores); /** * Register a FlushRequestListener diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index 76175117af..28f5a716be 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -1767,14 +1767,15 @@ public class HRegionServer extends HasThread implements FlushRequester requester = server.getFlushRequester(); if (requester != null) { long randomDelay = (long) RandomUtils.nextInt(0, RANGE_OF_DELAY) + MIN_DELAY_TIME; - LOG.info(getName() + " requesting flush of " + - r.getRegionInfo().getRegionNameAsString() + " because " + - whyFlush.toString() + - " after random delay " + randomDelay + "ms"); //Throttle the flushes by putting a delay. If we don't throttle, and there //is a balanced write-load on the regions in a table, we might end up //overwhelming the filesystem with too many flushes at once. - requester.requestDelayedFlush(r, randomDelay, false); + if (requester.requestDelayedFlush(r, randomDelay, false)) { + LOG.info(getName() + " requesting flush of " + + r.getRegionInfo().getRegionNameAsString() + " because " + + whyFlush.toString() + + " after random delay " + randomDelay + "ms"); + } } } } 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 2a49797e52..c526141387 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 @@ -460,7 +460,7 @@ class MemStoreFlusher implements FlushRequester { } @Override - public void requestFlush(HRegion r, boolean forceFlushAllStores, FlushLifeCycleTracker tracker) { + public boolean requestFlush(HRegion r, boolean forceFlushAllStores, FlushLifeCycleTracker tracker) { r.incrementFlushesQueuedCount(); synchronized (regionsInQueue) { if (!regionsInQueue.containsKey(r)) { @@ -469,14 +469,16 @@ class MemStoreFlusher implements FlushRequester { FlushRegionEntry fqe = new FlushRegionEntry(r, forceFlushAllStores, tracker); this.regionsInQueue.put(r, fqe); this.flushQueue.add(fqe); + return true; } else { tracker.notExecuted("Flush already requested on " + r); + return false; } } } @Override - public void requestDelayedFlush(HRegion r, long delay, boolean forceFlushAllStores) { + public boolean requestDelayedFlush(HRegion r, long delay, boolean forceFlushAllStores) { r.incrementFlushesQueuedCount(); synchronized (regionsInQueue) { if (!regionsInQueue.containsKey(r)) { @@ -486,7 +488,9 @@ class MemStoreFlusher implements FlushRequester { fqe.requeue(delay); this.regionsInQueue.put(r, fqe); this.flushQueue.add(fqe); + return true; } + return false; } } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHeapMemoryManager.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHeapMemoryManager.java index 41bfd48c0a..9f05a73f6f 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHeapMemoryManager.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHeapMemoryManager.java @@ -758,14 +758,15 @@ public class TestHeapMemoryManager { } @Override - public void requestFlush(HRegion region, boolean forceFlushAllStores, + public boolean requestFlush(HRegion region, boolean forceFlushAllStores, FlushLifeCycleTracker tracker) { this.listener.flushRequested(flushType, region); + return true; } @Override - public void requestDelayedFlush(HRegion region, long delay, boolean forceFlushAllStores) { - + public boolean requestDelayedFlush(HRegion region, long delay, boolean forceFlushAllStores) { + return true; } @Override diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestWALReplay.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestWALReplay.java index 93c379c8ef..5c5f39444a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestWALReplay.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestWALReplay.java @@ -1110,16 +1110,18 @@ public abstract class AbstractTestWALReplay { private HRegion r; @Override - public void requestFlush(HRegion region, boolean force, FlushLifeCycleTracker tracker) { + public boolean requestFlush(HRegion region, boolean force, FlushLifeCycleTracker tracker) { try { r.flush(force); + return true; } catch (IOException e) { throw new RuntimeException("Exception flushing", e); } } @Override - public void requestDelayedFlush(HRegion region, long when, boolean forceFlushAllStores) { + public boolean requestDelayedFlush(HRegion region, long when, boolean forceFlushAllStores) { + return true; } @Override -- 2.15.1 (Apple Git-101)