You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jg...@apache.org on 2010/05/19 20:28:05 UTC

svn commit: r946326 - in /hbase/trunk: CHANGES.txt core/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java core/src/main/resources/hbase-default.xml

Author: jgray
Date: Wed May 19 18:28:05 2010
New Revision: 946326

URL: http://svn.apache.org/viewvc?rev=946326&view=rev
Log:
HBASE-2559  Set hbase.hregion.majorcompaction to 0 to disable

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
    hbase/trunk/core/src/main/resources/hbase-default.xml

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=946326&r1=946325&r2=946326&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Wed May 19 18:28:05 2010
@@ -649,6 +649,7 @@ Release 0.21.0 - Unreleased
                desired number of regions
    HBASE-2529  Make OldLogsCleaner easier to extend
    HBASE-2527  Add the ability to easily extend some HLog actions
+   HBASE-2559  Set hbase.hregion.majorcompaction to 0 to disable
 
   OPTIMIZATIONS
    HBASE-410   [testing] Speed up the test suite

Modified: hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
URL: http://svn.apache.org/viewvc/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java?rev=946326&r1=946325&r2=946326&view=diff
==============================================================================
--- hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java (original)
+++ hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java Wed May 19 18:28:05 2010
@@ -838,7 +838,8 @@ public class Store implements HConstants
   private boolean isMajorCompaction(final List<StoreFile> filesToCompact)
   throws IOException {
     boolean result = false;
-    if (filesToCompact == null || filesToCompact.isEmpty()) {
+    if (filesToCompact == null || filesToCompact.isEmpty() ||
+        majorCompactionTime == 0) {
       return result;
     }
     long lowTimestamp = getLowestTimestamp(fs,

Modified: hbase/trunk/core/src/main/resources/hbase-default.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/core/src/main/resources/hbase-default.xml?rev=946326&r1=946325&r2=946326&view=diff
==============================================================================
--- hbase/trunk/core/src/main/resources/hbase-default.xml (original)
+++ hbase/trunk/core/src/main/resources/hbase-default.xml Wed May 19 18:28:05 2010
@@ -394,6 +394,7 @@
     <value>86400000</value>
     <description>The time (in miliseconds) between 'major' compactions of all
     HStoreFiles in a region.  Default: 1 day.
+    Set to 0 to disable automated major compactions.
     </description>
   </property>
   <property>