hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdcry...@apache.org
Subject svn commit: r1185318 - in /hbase/branches/0.92: CHANGES.txt src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
Date Mon, 17 Oct 2011 18:19:49 GMT
Author: jdcryans
Date: Mon Oct 17 18:19:49 2011
New Revision: 1185318

URL: http://svn.apache.org/viewvc?rev=1185318&view=rev
Log:
   HBASE-4579  CST.requestCompaction semantics changed, logs are now
               spammed when too many store files

Modified:
    hbase/branches/0.92/CHANGES.txt
    hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
    hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java

Modified: hbase/branches/0.92/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1185318&r1=1185317&r2=1185318&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Mon Oct 17 18:19:49 2011
@@ -342,6 +342,8 @@ Release 0.92.0 - Unreleased
                Hadoop 0.23 (todd)
    HBASE-3446  ProcessServerShutdown fails if META moves, orphaning lots of
                regions
+   HBASE-4579  CST.requestCompaction semantics changed, logs are now
+               spammed when too many store files
 
   TESTS
    HBASE-4492  TestRollingRestart fails intermittently

Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java?rev=1185318&r1=1185317&r2=1185318&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
(original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
Mon Oct 17 18:19:49 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/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java?rev=1185318&r1=1185317&r2=1185318&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java (original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java Mon
Oct 17 18:19:49 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;
     }
 



Mime
View raw message