From 8fcb620d95e913d58a8bf072be8b8a7f6630497e Mon Sep 17 00:00:00 2001 From: Stefania Alborghetti Date: Tue, 2 Jun 2015 16:42:50 +0200 Subject: [PATCH] Partial backport of CASSANDRA-8739 - avoid LCS overlap in L1 Patch by Stefania Alborghetti; reviewed by marcuse for CASSANDRA-8656 --- .../org/apache/cassandra/db/compaction/LeveledManifest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java index 81c65e490e..783912177d 100644 --- a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java +++ b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java @@ -547,6 +547,8 @@ public class LeveledManifest Set l1overlapping = overlapping(candidates, generations[1]); if (Sets.intersection(l1overlapping, compacting).size() > 0) return Collections.emptyList(); + if (!overlapping(candidates, compactingL0).isEmpty()) + return Collections.emptyList(); candidates = Sets.union(candidates, l1overlapping); } if (candidates.size() < 2)