Author: stack
Date: Wed Dec 21 04:06:03 2011
New Revision: 1221601
URL: http://svn.apache.org/viewvc?rev=1221601&view=rev
Log:
HBASE-5077 SplitLogWorker fails to let go of a task, kills the RS
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java
Modified: hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1221601&r1=1221600&r2=1221601&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Wed Dec 21 04:06:03 2011
@@ -460,6 +460,7 @@ Release 0.92.0 - Unreleased
HBASE-4935 hbase 0.92.0 doesn't work going against 0.20.205.0, its
packaged hadoop
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-4450 test for number of blocks read: to serve as baseline for
expected
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java?rev=1221601&r1=1221600&r2=1221601&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java
Wed Dec 21 04:06:03 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;
}
/**
