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

Change concurrent_compactors defaults 

patch by jbellis; reviewed by bes for CASSANDRA-7139
This commit is contained in:
Jonathan Ellis 2014-05-21 13:11:16 -05:00
parent e024a1cc2b
commit e00878d955
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
2.1.0-rc1 2.1.0-rc1
* Change concurrent_compactors defaults (CASSANDRA-7139)
* Add PowerShell Windows launch scripts (CASSANDRA-7001) * Add PowerShell Windows launch scripts (CASSANDRA-7001)
* Make commitlog archive+restore more robust (CASSANDRA-6974) * Make commitlog archive+restore more robust (CASSANDRA-6974)
* Fix marking commitlogsegments clean (CASSANDRA-6959) * Fix marking commitlogsegments clean (CASSANDRA-6959)

4
conf/cassandra.yaml
View File

@ -500,8 +500,8 @@ in_memory_compaction_limit_in_mb: 64
# slowly or too fast, you should look at # slowly or too fast, you should look at
# compaction_throughput_mb_per_sec first. # compaction_throughput_mb_per_sec first.
# #
# concurrent_compactors defaults to the number of cores. # concurrent_compactors defaults to the smaller of (number of disks,
# Uncomment to make compaction mono-threaded, the pre-0.8 default. # number of cores), with a minimum of 2 and a maximum of 8.
#concurrent_compactors: 1 #concurrent_compactors: 1
# Throttles compaction to the given total throughput across the entire # Throttles compaction to the given total throughput across the entire

2
src/java/org/apache/cassandra/config/Config.java
View File

@ -132,7 +132,7 @@ public class Config
public Integer column_index_size_in_kb = 64; public Integer column_index_size_in_kb = 64;
public Integer batch_size_warn_threshold_in_kb = 5; public Integer batch_size_warn_threshold_in_kb = 5;
public Integer in_memory_compaction_limit_in_mb = 64; public Integer in_memory_compaction_limit_in_mb = 64;
public Integer concurrent_compactors = FBUtilities.getAvailableProcessors(); public Integer concurrent_compactors;
public volatile Integer compaction_throughput_mb_per_sec = 16; public volatile Integer compaction_throughput_mb_per_sec = 16;
public Integer max_streaming_retries = 3; public Integer max_streaming_retries = 3;

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

@ -453,7 +453,7 @@ public class DatabaseDescriptor
} }
if (conf.concurrent_compactors == null) if (conf.concurrent_compactors == null)
conf.concurrent_compactors = FBUtilities.getAvailableProcessors(); conf.concurrent_compactors = Math.min(8, Math.max(2, Math.min(FBUtilities.getAvailableProcessors(), conf.data_file_directories.length)));
if (conf.concurrent_compactors <= 0) if (conf.concurrent_compactors <= 0)
throw new ConfigurationException("concurrent_compactors should be strictly greater than 0"); throw new ConfigurationException("concurrent_compactors should be strictly greater than 0");