Repository: cassandra Updated Branches: refs/heads/trunk a289e71bd -> d1a552dd7
Don't use the same CleanupStrategy for all sstables Patch by marcuse; reviewed by thobbs for CASSANDRA-8537 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/14b2d7a1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14b2d7a1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14b2d7a1 Branch: refs/heads/trunk Commit: 14b2d7a16b4b69eed6be5473dbbf238f040fb5c5 Parents: 818ec33 Author: Marcus Eriksson <[email protected]> Authored: Thu Jan 8 14:39:08 2015 +0100 Committer: Marcus Eriksson <[email protected]> Committed: Fri Jan 9 07:33:17 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/compaction/CompactionManager.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/14b2d7a1/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 57c2f49..2028633 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.3 + * Don't reuse the same cleanup strategy for all sstables (CASSANDRA-8537) * Fix case-sensitivity of index name on CREATE and DROP INDEX statements (CASSANDRA-8365) * Better detection/logging for corruption in compressed sstables (CASSANDRA-8192) http://git-wip-us.apache.org/repos/asf/cassandra/blob/14b2d7a1/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java index 872ebed..eb7c0ee 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java @@ -347,7 +347,7 @@ public class CompactionManager implements CompactionManagerMBean return AllSSTableOpStatus.ABORTED; } final boolean hasIndexes = cfStore.indexManager.hasIndexes(); - final CleanupStrategy cleanupStrategy = CleanupStrategy.get(cfStore, ranges); + return parallelAllSSTableOperation(cfStore, new OneSSTableOperation() { @Override @@ -361,6 +361,7 @@ public class CompactionManager implements CompactionManagerMBean @Override public void execute(SSTableReader input) throws IOException { + CleanupStrategy cleanupStrategy = CleanupStrategy.get(cfStore, ranges); doCleanupOne(cfStore, input, cleanupStrategy, ranges, hasIndexes); } });
