commit a6430c8ba2c05569b941b27323156d30dd1d55e6
author Marcus Eriksson <marcuse@apache.org> Mon Aug 01 10:46:15 2016 +0200
committer Marcus Eriksson <marcuse@apache.org> Mon Aug 01 10:46:15 2016 +0200
tree 7975002a87163772d6dedddb00575fd179fdf894
parent 4ad335348677c2ff3c80cf58bcd21715abbf4a2b
parent a98552e65c823238862893c8cf515f866cccbbd7

Merge branch 'cassandra-3.9' into trunk

CHANGES.txt

diff --git a/CHANGES.txt b/CHANGES.txt
index 80063c8..36a21e6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -43,6 +43,7 @@
  * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214)
 Merged from 2.1:
  * cannot use cql since upgrading python to 2.7.11+ (CASSANDRA-11850)
+ * Allow STCS-in-L0 compactions to reduce scope with LCS (CASSANDRA-12040)
 
 3.8
  * Fix hdr logging for single operation workloads (CASSANDRA-12145)

src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java

diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java
index 39c5d64..c633937 100644
--- a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java
+++ b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java
@@ -55,7 +55,7 @@
     @Override
     protected boolean partialCompactionsAcceptable()
     {
-        return false;
+        return level == 0;
     }
 
     protected int getLevel()