You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2009/05/12 20:54:43 UTC
svn commit: r774017 -
/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/MemcacheFlusher.java
Author: apurtell
Date: Tue May 12 18:54:43 2009
New Revision: 774017
URL: http://svn.apache.org/viewvc?rev=774017&view=rev
Log:
HBASE-1058 Prevent runaway compactions; patch 1058-2-v1
Modified:
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/MemcacheFlusher.java
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/MemcacheFlusher.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/MemcacheFlusher.java?rev=774017&r1=774016&r2=774017&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/MemcacheFlusher.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/MemcacheFlusher.java Tue May 12 18:54:43 2009
@@ -223,32 +223,26 @@
*/
private boolean flushRegion(HRegion region, boolean removeFromQueue) {
// Wait until it is safe to flush.
- // TODO: Fix. This block doesn't work if more than one store.
- int count = 0;
- boolean triggered = false;
- while (count++ < (blockingWaitTime / 500)) {
+ boolean toomany;
+ do {
+ toomany = false;
for (Store hstore: region.stores.values()) {
int files = hstore.getStorefilesCount();
if (files > this.blockingStoreFilesNumber) {
- if (!triggered) {
- server.compactSplitThread.compactionRequested(region, getName());
- LOG.info("Too many store files in store " + hstore + ": " +
- files + ", pausing");
- triggered = true;
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Too many store files in store " + hstore + ": " +
+ files + ", waiting");
}
+ toomany = true;
+ server.compactSplitThread.compactionRequested(region, getName());
try {
- Thread.sleep(500);
+ Thread.sleep(blockingWaitTime);
} catch (InterruptedException e) {
// ignore
}
- continue;
}
}
- if (triggered) {
- LOG.info("Compaction triggered on region " + region + ", proceeding");
- }
- break;
- }
+ } while (toomany);
synchronized (regionsInQueue) {
// See comment above for removeFromQueue on why we do not
// take the region out of the set. If removeFromQueue is true, remove it