cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/6] git commit: newer 5195 patch
Date Fri, 22 Mar 2013 14:26:15 GMT
newer 5195 patch


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/42604136
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/42604136
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/42604136

Branch: refs/heads/trunk
Commit: 426041368f4cf56ebf97b28375665604f38946e0
Parents: 01d81d2
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Fri Mar 22 09:25:45 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Fri Mar 22 09:25:45 2013 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/db/DefsTable.java    |    2 ++
 .../apache/cassandra/tools/StandaloneScrubber.java |    4 +++-
 2 files changed, 5 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/42604136/src/java/org/apache/cassandra/db/DefsTable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/DefsTable.java b/src/java/org/apache/cassandra/db/DefsTable.java
index d564eaf..88d184e 100644
--- a/src/java/org/apache/cassandra/db/DefsTable.java
+++ b/src/java/org/apache/cassandra/db/DefsTable.java
@@ -323,6 +323,8 @@ public class DefsTable
             // store deserialized keyspaces into new place
             dumpToStorage(keyspaces);
 
+            flushSchemaCFs();
+
             logger.info("Truncating deprecated system column families (migrations, schema)...");
             dropColumnFamily(Table.SYSTEM_TABLE, OLD_MIGRATIONS_CF);
             dropColumnFamily(Table.SYSTEM_TABLE, OLD_SCHEMA_CF);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/42604136/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/StandaloneScrubber.java b/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
index 813ccd2..481406f 100644
--- a/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
+++ b/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
@@ -55,7 +55,9 @@ public class StandaloneScrubber
         Options options = Options.parseArgs(args);
         try
         {
-            Directories.migrateSSTables();
+            // Migrate sstables from pre-#2749 to the correct location
+            if (Directories.sstablesNeedsMigration())
+                Directories.migrateSSTables();
 
             // load keyspace descriptions.
             DatabaseDescriptor.loadSchemas();


Mime
View raw message