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

[gd...@apache.org]

Author: gdusbabek
Date: Tue Oct  5 12:48:51 2010
New Revision: 1004626

URL: http://svn.apache.org/viewvc?rev=1004626&view=rev
Log:
ignore debris in the commit log directory. patch by Matthew Dennis, reviewed by Gary Dusbabek. CASSANDRA-1547

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=1004626&r1=1004625&r2=1004626&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.6/CHANGES.txt Tue Oct  5 12:48:51 2010
@@ -1,3 +1,7 @@
+dev
+ * Ignore stray files in the commit log directory (CASSANDRA-1547)
+
+
 0.6.6
  * Allow using DynamicEndpointSnitch with RackAwareStrategy (CASSANDRA-1429)
  * remove the remaining vestiges of the unfinished DatacenterShardStrategy 

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=1004626&r1=1004625&r2=1004626&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 Tue Oct  5 12:48:51 2010
@@ -161,8 +161,7 @@ public class CommitLog
         {
             public boolean accept(File dir, String name)
             {
-                // throw out anything that starts with dot.
-                return !name.matches("\\..*");
+                return name.matches("CommitLog-\\d+.log");
             }
         });
         if (files.length == 0)