natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.0' into cassandra-2.1.0 

Conflicts:
	CHANGES.txt
	NEWS.txt
	src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
This commit is contained in:
Marcus Eriksson 2014-07-03 14:29:31 +02:00
parent ea38ddced2 f39cb073ac
commit 8c4ffbe657
4 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -15,6 +15,7 @@ Merged from 2.0:
* Make sure high level sstables get compacted (CASSANDRA-7414)
* Fix AssertionError when using empty clustering columns and static columns
(CASSANDRA-7455)
* Add option to disable STCS in L0 (CASSANDRA-6621)
* Upgrade to snappy-java 1.0.5.2 (CASSANDRA-7476)

9
NEWS.txt
View File

@ -71,6 +71,15 @@ Upgrading
- support for supercolumns has been removed from json2sstable
2.0.10
====
New features
------------
- If you are using Leveled Compaction, you can now disable doing size-tiered
compaction in L0 by starting Cassandra with -Dcassandra.disable_stcs_in_l0
(see CASSANDRA-6621 for details).
2.0.9
=====

5
src/java/org/apache/cassandra/config/DatabaseDescriptor.java
View File

@ -984,6 +984,11 @@ public class DatabaseDescriptor
conf.compaction_throughput_mb_per_sec = value;
}
public static boolean getDisableSTCSInL0()
{
return Boolean.getBoolean("cassandra.disable_stcs_in_l0");
}
public static int getStreamThroughputOutboundMegabitsPerSec()
{
return conf.stream_throughput_outbound_megabits_per_sec;

5
src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
View File

@ -31,6 +31,9 @@ import com.google.common.primitives.Ints;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.Schema;
import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.RowPosition;
import org.apache.cassandra.dht.Bounds;
@ -370,7 +373,7 @@ public class LeveledManifest
if (score > 1.001)
{
// before proceeding with a higher level, let's see if L0 is far enough behind to warrant STCS
if (getLevel(0).size() > MAX_COMPACTING_L0)
if (!DatabaseDescriptor.getDisableSTCSInL0() && getLevel(0).size() > MAX_COMPACTING_L0)
{
List<SSTableReader> mostInteresting = getSSTablesForSTCS(getLevel(0));
if (!mostInteresting.isEmpty())