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: Update offline scrub for 1.0-> 1.1 directory structure patch by Omid Aladini; reviewed by Marcus Eriksson for CASSANDRA-5195)
Date Fri, 22 Mar 2013 14:23:32 GMT
Update offline scrub for 1.0-> 1.1 directory structure
patch by Omid Aladini; reviewed by Marcus Eriksson for CASSANDRA-5195)


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

Branch: refs/heads/trunk
Commit: 01d81d27651c9608fa1344ea1ca769ea8ec4e4d6
Parents: c5864a5
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Fri Mar 22 09:22:28 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Fri Mar 22 09:22:28 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 .../apache/cassandra/tools/StandaloneScrubber.java |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/01d81d27/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e2b1daa..b4fdd1d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 1.1.11
+ * Update offline scrub for 1.0 -> 1.1 directory structure (CASSANDRA-5195)
  * add tmp flag to Descriptor hashcode (CASSANDRA-4021)
  * fix logging of "Found table data in data directories" when only system tables
    are present (CASSANDRA-5289)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/01d81d27/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 439ee0d..813ccd2 100644
--- a/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
+++ b/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
@@ -55,6 +55,8 @@ public class StandaloneScrubber
         Options options = Options.parseArgs(args);
         try
         {
+            Directories.migrateSSTables();
+
             // load keyspace descriptions.
             DatabaseDescriptor.loadSchemas();
 


Mime
View raw message