svn commit: r1029939 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

[jgray]

Author: jgray
Date: Tue Nov  2 02:07:20 2010
New Revision: 1029939

URL: http://svn.apache.org/viewvc?rev=1029939&view=rev
Log:
HBASE-3185  User-triggered compactions are triggering splits

Modified:
    hbase/trunk/CHANGES.txt
    
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

Modified: hbase/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1029939&r1=1029938&r2=1029939&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Tue Nov  2 02:07:20 2010
@@ -639,6 +639,7 @@ Release 0.21.0 - Unreleased
                or build HBase
    HBASE-3179  Enable ReplicationLogsCleaner only if replication is,
                and fix its test
+   HBASE-3185  User-triggered compactions are triggering splits!
 
 
   IMPROVEMENTS

Modified: 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1029939&r1=1029938&r2=1029939&view=diff
==============================================================================
--- 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
 (original)
+++ 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
 Tue Nov  2 02:07:20 2010
@@ -2035,8 +2035,6 @@ public class HRegionServer implements HR
   public void compactRegion(HRegionInfo regionInfo, boolean major)
       throws NotServingRegionException, IOException {
     HRegion region = getRegion(regionInfo.getRegionName());
-    region.flushcache();
-    region.shouldSplit(true);
     compactSplitThread.requestCompaction(region, major, "User-triggered "
         + (major ? "major " : "") + "compaction",
         CompactSplitThread.PRIORITY_USER);