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/07/07 23:01:18 UTC
svn commit: r791977 - in /hadoop/hbase/trunk: CHANGES.txt
src/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
Author: stack
Date: Tue Jul 7 21:01:18 2009
New Revision: 791977
URL: http://svn.apache.org/viewvc?rev=791977&view=rev
Log:
HBASE-1618 Investigate further into the MemStoreFlusher StoreFile limit
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=791977&r1=791976&r2=791977&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Tue Jul 7 21:01:18 2009
@@ -245,6 +245,8 @@
HBASE-1615 HBASE-1597 introduced a bug when compacting after a split
(Jon Gray via Stack)
HBASE-1616 Unit test of compacting referenced StoreFiles (Jon Gray via Stack)
+ HBASE-1618 Investigate further into the MemStoreFlusher StoreFile limit
+ (Jon Gray via Stack)
IMPROVEMENTS
HBASE-1089 Add count of regions on filesystem to master UI; add percentage
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java?rev=791977&r1=791976&r2=791977&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java Tue Jul 7 21:01:18 2009
@@ -222,10 +222,11 @@
* not flushed.
*/
private boolean flushRegion(HRegion region, boolean removeFromQueue) {
- // Wait until it is safe to flush
int count = 0;
boolean triggered = false;
+ boolean finished = false;
while (count++ < (blockingWaitTime / 500)) {
+ finished = true;
for (Store hstore: region.stores.values()) {
if (hstore.getStorefilesCount() > this.blockingStoreFilesNumber) {
// always request a compaction
@@ -233,22 +234,28 @@
// only log once
if (!triggered) {
LOG.info("Too many store files for region " + region + ": " +
- hstore.getStorefilesCount() + ", waiting");
+ hstore.getStorefilesCount() + ", requesting compaction and " +
+ "waiting");
triggered = true;
}
+ // pending compaction, not finished
+ finished = false;
try {
Thread.sleep(500);
} catch (InterruptedException e) {
// ignore
}
- continue;
}
}
- if (triggered) {
- LOG.info("Compaction completed on region " + region +
- ", proceeding");
+ if(triggered && finished) {
+ LOG.info("Compaction has completed, we waited " + (count * 500) + "ms, "
+ + "finishing flush of region " + region);
+ break;
}
- break;
+ }
+ if(triggered && !finished) {
+ LOG.warn("Tried to hold up flushing for compactions of region " + region +
+ " but have waited longer than " + blockingWaitTime + "ms, continuing");
}
synchronized (regionsInQueue) {
// See comment above for removeFromQueue on why we do not