You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jd...@apache.org on 2011/10/17 20:19:19 UTC
svn commit: r1185316 - in
/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver:
MemStoreFlusher.java Store.java
Author: jdcryans
Date: Mon Oct 17 18:19:18 2011
New Revision: 1185316
URL: http://svn.apache.org/viewvc?rev=1185316&view=rev
Log:
HBASE-4579 CST.requestCompaction semantics changed, logs are now
spammed when too many store files
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java?rev=1185316&r1=1185315&r2=1185316&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java Mon Oct 17 18:19:18 2011
@@ -355,10 +355,11 @@ class MemStoreFlusher extends Thread imp
// Note: We don't impose blockingStoreFiles constraint on meta regions
LOG.warn("Region " + region.getRegionNameAsString() + " has too many " +
"store files; delaying flush up to " + this.blockingWaitTime + "ms");
+ if (!this.server.compactSplitThread.requestSplit(region)) {
+ this.server.compactSplitThread.requestCompaction(region, getName());
+ }
}
- if (!this.server.compactSplitThread.requestSplit(region)) {
- this.server.compactSplitThread.requestCompaction(region, getName());
- }
+
// Put back on the queue. Have it come back out of the queue
// after a delay of this.blockingWaitTime / 100 ms.
this.flushQueue.add(fqe.requeue(this.blockingWaitTime / 100));
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java?rev=1185316&r1=1185315&r2=1185316&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java Mon Oct 17 18:19:18 2011
@@ -1003,7 +1003,8 @@ public class Store implements HeapSize {
}
if (filesToCompact.isEmpty()) {
- LOG.debug(this.storeNameStr + ": no store files to compact");
+ LOG.debug(this.getHRegionInfo().getEncodedName() + " - " +
+ this.storeNameStr + ": no store files to compact");
return filesToCompact;
}