svn commit: r965457 - in /cassandra/branches/cassandra-0.6: CHANGES.txt src/java/org/apache/cassandra/db/commitlog/CommitLog.java

[jb...@apache.org]

Author: jbellis
Date: Mon Jul 19 12:39:45 2010
New Revision: 965457

URL: http://svn.apache.org/viewvc?rev=965457&view=rev
Log:
if a fully-flushed commitlog segment is encountered, continue to the next instead of stopping replay entirely.  patch by jingfengtan; reviewed by jbellis for CASSANDRA-1297

Modified:
    cassandra/branches/cassandra-0.6/CHANGES.txt
    cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/commitlog/CommitLog.java

Modified: cassandra/branches/cassandra-0.6/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/CHANGES.txt?rev=965457&r1=965456&r2=965457&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.6/CHANGES.txt Mon Jul 19 12:39:45 2010
@@ -10,6 +10,8 @@
    (CASSANDRA-1280, CASSANDRA-1047)
  * log thread pool stats when GC is excessive (CASSANDRA-1275)
  * log errors in gossip instead of re-throwing (CASSANDRA-1289)
+ * avoid aborting commitlog replay prematurely if a flushed-but-
+   not-removed commitlog segment is encountered (CASSANDRA-1297)
 
 
 0.6.3

Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/commitlog/CommitLog.java?rev=965457&r1=965456&r2=965457&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/commitlog/CommitLog.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/commitlog/CommitLog.java Mon Jul 19 12:39:45 2010
@@ -197,7 +197,7 @@ public class CommitLog
             /* seek to the lowest position where any CF has non-flushed data */
             int lowPos = CommitLogHeader.getLowestPosition(clHeader);
             if (lowPos == 0)
-                break;
+                continue;
 
             reader.seek(lowPos);
             if (logger.isDebugEnabled())