svn commit: r1181394 - /hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java

[ns...@apache.org]

Author: nspiegelberg
Date: Tue Oct 11 02:04:58 2011
New Revision: 1181394

URL: http://svn.apache.org/viewvc?rev=1181394&view=rev
Log:
Ensure that we log compaction requests

Summary:
Our internal logging logic got messsed up pulling in a patch from the open
source.

changing the order to ensure that our logging logic works.

Test Plan:
going to run testsuite.

DiffCamp Revision: 165113
Reviewed By: kannan
CC: kannan
Revert Plan:
OK

Modified:
    hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java

Modified: hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java?rev=1181394&r1=1181393&r2=1181394&view=diff
==============================================================================
--- hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java (original)
+++ hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java Tue Oct 11 02:04:58 2011
@@ -170,6 +170,8 @@ class CompactSplitThread extends Thread 
 
     r.setForceMajorCompaction(force);
 
+    addedToQueue = compactionQueue.add(r, priority);
+
     // only log if actually added to compaction queue...
     if (addedToQueue && LOG.isDebugEnabled()) {
       LOG.debug("Compaction " + (force? "(major) ": "") +
@@ -178,7 +180,6 @@ class CompactSplitThread extends Thread 
         (why != null && !why.isEmpty()? " because: " + why: "") +
         "; Priority: " + priority + "; Compaction queue size: " + compactionQueue.size());
     }
-    compactionQueue.add(r, priority);
   }
 
   private void split(final HRegion region, final byte [] midKey)