Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-18451 PeriodicMemstoreFlusher should inspect the queue before adding a delayed flush request, fix logging 

Signed-off-by: Andrew Purtell <apurtell@apache.org>
This commit is contained in:
xcang 2018-09-25 08:50:05 -07:00 committed by Andrew Purtell
parent 6bc7089f9e
commit 704f8b81bb
No known key found for this signature in database
GPG Key ID: 8597754DD5365CCD
5 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/FlushRequester.java
View File

@ -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

10
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
View File

@ -1773,14 +1773,14 @@ 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("{} requesting flush of {} because {} after random delay {} ms",
getName(), r.getRegionInfo().getRegionNameAsString(), whyFlush.toString(),
randomDelay);
}
}
}
}

13
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
View File

@ -460,8 +460,8 @@ class MemStoreFlusher implements FlushRequester {
}
@Override
public void requestFlush(HRegion r, boolean forceFlushAllStores, FlushLifeCycleTracker tracker) {
r.incrementFlushesQueuedCount();
public boolean requestFlush(HRegion r, boolean forceFlushAllStores,
FlushLifeCycleTracker tracker) {
synchronized (regionsInQueue) {
if (!regionsInQueue.containsKey(r)) {
// This entry has no delay so it will be added at the top of the flush
@ -469,15 +469,17 @@ class MemStoreFlusher implements FlushRequester {
FlushRegionEntry fqe = new FlushRegionEntry(r, forceFlushAllStores, tracker);
this.regionsInQueue.put(r, fqe);
this.flushQueue.add(fqe);
r.incrementFlushesQueuedCount();
return true;
} else {
tracker.notExecuted("Flush already requested on " + r);
return false;
}
}
}
@Override
public void requestDelayedFlush(HRegion r, long delay, boolean forceFlushAllStores) {
r.incrementFlushesQueuedCount();
public boolean requestDelayedFlush(HRegion r, long delay, boolean forceFlushAllStores) {
synchronized (regionsInQueue) {
if (!regionsInQueue.containsKey(r)) {
// This entry has some delay
@ -486,7 +488,10 @@ class MemStoreFlusher implements FlushRequester {
fqe.requeue(delay);
this.regionsInQueue.put(r, fqe);
this.flushQueue.add(fqe);
r.incrementFlushesQueuedCount();
return true;
}
return false;
}
}

7
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHeapMemoryManager.java
View File

@ -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

6
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestWALReplay.java
View File

@ -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