svn commit: r885572 - in /incubator/cassandra/trunk: CHANGES.txt src/java/org/apache/cassandra/db/Table.java src/java/org/apache/cassandra/service/StorageService.java

[jbellis]

Author: jbellis
Date: Mon Nov 30 20:00:04 2009
New Revision: 885572

URL: http://svn.apache.org/viewvc?rev=885572&view=rev
Log:
skip the system table (keyspace) for cleanup, it's local-only.  patch by 
jbellis; reviewed by Stu Hood for CASSANDRA-579

Modified:
    incubator/cassandra/trunk/CHANGES.txt
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java
    
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java

Modified: incubator/cassandra/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/CHANGES.txt?rev=885572&r1=885571&r2=885572&view=diff
==============================================================================
--- incubator/cassandra/trunk/CHANGES.txt (original)
+++ incubator/cassandra/trunk/CHANGES.txt Mon Nov 30 20:00:04 2009
@@ -4,6 +4,7 @@
    in clusters with multiple seeds (CASSANDRA-150)
  * fix NPE in get_range_slice when no data is found (CASSANDRA-578)
  * fix potential NPE in hinted handoff (CASSANDRA-585)
+ * fix cleanup of local "system" keyspace (CASSANDRA-576)
 
 
 0.5.0 beta

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java?rev=885572&r1=885571&r2=885572&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java 
(original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java Mon 
Nov 30 20:00:04 2009
@@ -248,6 +248,9 @@
      */
     public void forceCleanup()
     {
+        if (table_.equals("system"))
+            throw new RuntimeException("Cleanup of the system table is neither 
necessary nor wise");
+
         Set<String> columnFamilies = tableMetadata_.getColumnFamilies();
         for ( String columnFamily : columnFamilies )
         {

Modified: 
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java?rev=885572&r1=885571&r2=885572&view=diff
==============================================================================
--- 
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
 (original)
+++ 
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
 Mon Nov 30 20:00:04 2009
@@ -586,8 +586,10 @@
     public void forceTableCleanup() throws IOException
     {
         List<String> tables = DatabaseDescriptor.getTables();
-        for ( String tName : tables )
+        for (String tName : tables)
         {
+            if (tName.equals("system"))
+                continue;
             Table table = Table.open(tName);
             table.forceCleanup();
         }