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 

Conflicts:
	CHANGES.txt
This commit is contained in:
Marcus Eriksson 2014-05-08 08:18:25 +02:00
parent 1b1f0b0790 0490abff4e
commit af802014d6
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -13,6 +13,7 @@ Merged from 2.0:
* return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183)
* reduce garbage creation in calculatePendingRanges (CASSANDRA-7191)
* fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162)
* Fix disabling autocompaction (CASSANDRA-7187)
Merged from 1.2:
* Add Cloudstack snitch (CASSANDRA-7147)
* Update system.peers correctly when relocating tokens (CASSANDRA-7126)

16
src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
View File

@ -87,13 +87,8 @@ public abstract class AbstractCompactionStrategy
tombstoneThreshold = optionValue == null ? DEFAULT_TOMBSTONE_THRESHOLD : Float.parseFloat(optionValue);
optionValue = options.get(TOMBSTONE_COMPACTION_INTERVAL_OPTION);
tombstoneCompactionInterval = optionValue == null ? DEFAULT_TOMBSTONE_COMPACTION_INTERVAL : Long.parseLong(optionValue);
optionValue = options.get(COMPACTION_ENABLED);
if (optionValue != null)
{
if (optionValue.equalsIgnoreCase("false"))
this.enabled = false;
}
if (!shouldBeEnabled())
this.disable();
}
catch (ConfigurationException e)
{
@ -376,4 +371,11 @@ public abstract class AbstractCompactionStrategy
uncheckedOptions.remove(COMPACTION_ENABLED);
return uncheckedOptions;
}
public boolean shouldBeEnabled()
{
String optionValue = options.get(COMPACTION_ENABLED);
return optionValue == null || Boolean.parseBoolean(optionValue);
}
}

3
src/java/org/apache/cassandra/service/CassandraDaemon.java
View File

@ -305,7 +305,8 @@ public class CassandraDaemon
{
for (final ColumnFamilyStore store : cfs.concatWithIndexes())
{
store.enableAutoCompaction();
if (store.getCompactionStrategy().shouldBeEnabled())
store.enableAutoCompaction();
}
}
}