Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 5ebadc11e -> c1a1a0085
Make sure we clear out all levels when rebuilding leveled manifest. Patch by jbellis; reviewed by marcuse for CASSANDRA-6957 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c1a1a008 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c1a1a008 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c1a1a008 Branch: refs/heads/cassandra-2.1 Commit: c1a1a00858303cc04dd2a272daa072a4da3e9050 Parents: 5ebadc1 Author: Marcus Eriksson <[email protected]> Authored: Mon Apr 7 08:48:37 2014 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Mon Apr 7 08:48:37 2014 +0200 ---------------------------------------------------------------------- .../apache/cassandra/db/compaction/LeveledManifest.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1a1a008/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java index 05b838d..e1a3db8 100644 --- a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java +++ b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java @@ -162,14 +162,12 @@ public class LeveledManifest */ private void rebuildManifestAfterFirstRepair() { - for (int i = 1; i < getAllLevelSize().length; i++) + for (int i = 0; i < getAllLevelSize().length; i++) { - - for (SSTableReader sstable : getLevel(i)) - { - generations[i] = new ArrayList<>(); + List<SSTableReader> oldLevel = generations[i]; + generations[i] = new ArrayList<>(); + for (SSTableReader sstable : oldLevel) add(sstable); - } } }
