Author: stack
Date: Wed Dec 21 04:05:12 2011
New Revision: 1221600

URL: http://svn.apache.org/viewvc?rev=1221600&view=rev
Log:
HBASE-5077 SplitLogWorker fails to let go of a task, kills the RS

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

Modified: hbase/branches/0.92/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1221600&r1=1221599&r2=1221600&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Wed Dec 21 04:05:12 2011
@@ -496,6 +496,7 @@ Release 0.92.0 - Unreleased
    HBASE-5063  RegionServers fail to report to backup HMaster after primary 
goes down
    HBASE-5078  DistributedLogSplitter failing to split file because it has 
edits for
                lots of regions
+   HBASE-5077  SplitLogWorker fails to let go of a task, kills the RS
 
   TESTS
    HBASE-4492  TestRollingRestart fails intermittently

Modified: 
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java?rev=1221600&r1=1221599&r2=1221600&view=diff
==============================================================================
--- 
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java
 (original)
+++ 
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java
 Wed Dec 21 04:05:12 2011
@@ -490,12 +490,12 @@ public class HLogSplitter {
       }
       String msg = "Processed " + editsCount + " edits across " + n + " 
regions" +
         " threw away edits for " + (logWriters.size() - n) + " regions" +
-        "; log file=" + logPath +
-        ", corrupted=" + isCorrupted;
+        "; log file=" + logPath + " is corrupted = " + isCorrupted +
+        " progress failed = " + progress_failed);
       LOG.info(msg);
       status.markComplete(msg);
     }
-    return true;
+    return !progress_failed;
   }
 
   /**


Reply via email to