svn commit: r956944 - /cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLog.java

[jb...@apache.org]

Author: jbellis
Date: Tue Jun 22 16:35:55 2010
New Revision: 956944

URL: http://svn.apache.org/viewvc?rev=956944&view=rev
Log:
avoid logging exception at INFO when cl header is missing / corrupt (common on power loss, now that we don't fsync it).  patch by jbellis

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLog.java

Modified: cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLog.java?rev=956944&r1=956943&r2=956944&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLog.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLog.java Tue Jun 22 16:35:55 2010
@@ -188,14 +188,16 @@ public class CommitLog
             BufferedRandomAccessFile reader = new BufferedRandomAccessFile(file.getAbsolutePath(), "r", bufferSize);
 
             int replayPosition = 0;
+            String headerPath = CommitLogHeader.getHeaderPathFromSegmentPath(file.getAbsolutePath());
             try
             {
-                clHeader = CommitLogHeader.readCommitLogHeader(CommitLogHeader.getHeaderPathFromSegmentPath(file.getAbsolutePath()));
+                clHeader = CommitLogHeader.readCommitLogHeader(headerPath);
                 replayPosition = clHeader.getReplayPosition();
             }
             catch (IOException ioe)
             {
-                logger.info("Attempted to read an incomplete, missing or corrupt CommitLogHeader.  Everything is ok, don't panic.  CommitLog will be replayed from the beginning", ioe);
+                logger.info(headerPath + " incomplete, missing or corrupt.  Everything is ok, don't panic.  CommitLog will be replayed from the beginning");
+                logger.debug("exception was", ioe);
             }
             reader.seek(replayPosition);