svn commit: r1079645 - in /cassandra/branches/cassandra-0.7: conf/log4j-server.properties src/java/org/apache/cassandra/db/CompactionManager.java src/java/org/apache/cassandra/io/sstable/IndexHelper.java

[jbellis]

Author: jbellis
Date: Wed Mar  9 02:42:20 2011
New Revision: 1079645

URL: http://svn.apache.org/viewvc?rev=1079645&view=rev
Log:
add more information to scrub errors

Modified:
    cassandra/branches/cassandra-0.7/conf/log4j-server.properties
    
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/CompactionManager.java
    
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/IndexHelper.java

Modified: cassandra/branches/cassandra-0.7/conf/log4j-server.properties
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/conf/log4j-server.properties?rev=1079645&r1=1079644&r2=1079645&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/conf/log4j-server.properties (original)
+++ cassandra/branches/cassandra-0.7/conf/log4j-server.properties Wed Mar  9 
02:42:20 2011
@@ -18,7 +18,7 @@
 # (%l is slower.)
 
 # output messages into a rolling log file as well as stdout
-log4j.rootLogger=INFO,stdout,R
+log4j.rootLogger=DEBUG,stdout,R
 
 # stdout
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/CompactionManager.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/CompactionManager.java?rev=1079645&r1=1079644&r2=1079645&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/CompactionManager.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/CompactionManager.java
 Wed Mar  9 02:42:20 2011
@@ -629,7 +629,7 @@ public class CompactionManager implement
                     }
                     else
                     {
-                        logger.warn("Row is unreadable; skipping to next");
+                        logger.warn("Row at " + dataStart + " is unreadable; 
skipping to next");
                         if (currentIndexKey != null)
                             dataFile.seek(nextRowPositionFromIndex);
                         badRows++;

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/IndexHelper.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/IndexHelper.java?rev=1079645&r1=1079644&r2=1079645&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/IndexHelper.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/IndexHelper.java
 Wed Mar  9 02:42:20 2011
@@ -110,7 +110,7 @@ public class IndexHelper
     {
         int size = file.readInt();
         if (size > maxSize || size <= 0)
-            throw new EOFException("bloom filter claims to be longer than 
entire row size");
+            throw new EOFException("bloom filter claims to be " + size + " 
bytes, longer than entire row size " + maxSize);
         ByteBuffer bytes = file.readBytes(size);
 
         DataInputStream stream = new 
DataInputStream(ByteBufferUtil.inputStream(bytes));