move schema loading until after cleanup patch by jbellis; reviewed by slebresne for CASSANDRA-3967
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dfea1200 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dfea1200 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dfea1200 Branch: refs/heads/trunk Commit: dfea1200ee775e58195ca97b35ac20f9d7b8f5fd Parents: 837ee0e Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Mar 8 14:21:45 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Mar 16 11:58:34 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ test/unit/org/apache/cassandra/CleanupHelper.java | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dfea1200/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index f0de7d1..3053bb3 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,6 @@ 1.1-dev + * rename loaded sstables to avoid conflicts with local snapshots + (CASSANDRA-3967) * start hint replay as soon as FD notifies that the target is back up (CASSANDRA-3958) * avoid unproductive deserializing of cached rows during compaction http://git-wip-us.apache.org/repos/asf/cassandra/blob/dfea1200/test/unit/org/apache/cassandra/CleanupHelper.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/CleanupHelper.java b/test/unit/org/apache/cassandra/CleanupHelper.java index a905ae4..94645a4 100644 --- a/test/unit/org/apache/cassandra/CleanupHelper.java +++ b/test/unit/org/apache/cassandra/CleanupHelper.java @@ -33,11 +33,17 @@ import org.apache.cassandra.db.filter.QueryPath; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.utils.ByteBufferUtil; -public class CleanupHelper extends SchemaLoader +public class CleanupHelper { private static Logger logger = LoggerFactory.getLogger(CleanupHelper.class); @BeforeClass + public static void cleanupLoadSchema() throws IOException + { + cleanupAndLeaveDirs(); + SchemaLoader.loadSchema(); // also opens CommitLog, so make sure this is last + } + public static void cleanupAndLeaveDirs() throws IOException { mkdirs();
