Updated Branches: refs/heads/cassandra-2.0 c4f6be8c4 -> 857a7f5fb
Add all sstables to the leveled manifest on startup. Patch by marcuse, reviewed by jbellis for CASSANDRA-5908 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8f367fdf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8f367fdf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8f367fdf Branch: refs/heads/cassandra-2.0 Commit: 8f367fdf92c03ee4bbcb0daa2272bd5155cf4174 Parents: cd47182 Author: Marcus Eriksson <marc...@spotify.com> Authored: Wed Aug 21 14:50:02 2013 +0200 Committer: Marcus Eriksson <marc...@spotify.com> Committed: Wed Aug 21 14:50:02 2013 +0200 ---------------------------------------------------------------------- .../apache/cassandra/db/compaction/LeveledCompactionStrategy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f367fdf/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java index 292220d..65abb0a 100644 --- a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java +++ b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java @@ -71,7 +71,7 @@ public class LeveledCompactionStrategy extends AbstractCompactionStrategy implem cfs.getDataTracker().subscribe(this); logger.debug("{} subscribed to the data tracker.", this); - manifest = LeveledManifest.create(cfs, this.maxSSTableSizeInMB, Collections.<SSTableReader>emptyList(), localOptions); + manifest = LeveledManifest.create(cfs, this.maxSSTableSizeInMB, cfs.getSSTables(), localOptions); logger.debug("Created {}", manifest); }