You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2009/05/21 01:24:07 UTC
svn commit: r776894 -
/hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/regionserver/MemcacheFlusher.java
Author: stack
Date: Wed May 20 23:24:07 2009
New Revision: 776894
URL: http://svn.apache.org/viewvc?rev=776894&view=rev
Log:
HBASE-1443 Back out 1058-2-v1 from 0.19 branch
Modified:
hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/regionserver/MemcacheFlusher.java
Modified: hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/regionserver/MemcacheFlusher.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/regionserver/MemcacheFlusher.java?rev=776894&r1=776893&r2=776894&view=diff
==============================================================================
--- hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/regionserver/MemcacheFlusher.java (original)
+++ hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/regionserver/MemcacheFlusher.java Wed May 20 23:24:07 2009
@@ -222,26 +222,31 @@
*/
private boolean flushRegion(HRegion region, boolean removeFromQueue) {
// Wait until it is safe to flush
- boolean toomany;
- do {
- toomany = false;
+ int count = 0;
+ boolean triggered = false;
+ while (count++ < (blockingWaitTime / 500)) {
for (HStore hstore: region.stores.values()) {
- int files = hstore.getStorefilesCount();
- if (files > this.blockingStoreFilesNumber) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Too many store files in store " + hstore + ": " +
- files + ", waiting");
+ if (hstore.getStorefilesCount() > this.blockingStoreFilesNumber) {
+ if (!triggered) {
+ server.compactSplitThread.compactionRequested(region, getName());
+ LOG.info("Too many store files for region " + region + ": " +
+ hstore.getStorefilesCount() + ", waiting");
+ triggered = true;
}
- toomany = true;
- server.compactSplitThread.compactionRequested(region, getName());
try {
- Thread.sleep(blockingWaitTime);
+ Thread.sleep(500);
} catch (InterruptedException e) {
// ignore
}
+ continue;
}
}
- } while (toomany);
+ if (triggered) {
+ LOG.info("Compaction completed on region " + region +
+ ", proceeding");
+ }
+ break;
+ }
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