Merge branch 'cassandra-1.1' into cassandra-1.2.0

This commit is contained in:
Jonathan Ellis 2012-12-11 12:37:55 -06:00
commit fc5a0cc293
1 changed files with 9 additions and 6 deletions

View File

@ -421,12 +421,15 @@ in_memory_compaction_limit_in_mb: 64
# Uncomment to make compaction mono-threaded, the pre-0.8 default.
#concurrent_compactors: 1
# Multi-threaded compaction. When enabled, each compaction will use
# up to one thread per core, plus one thread per sstable being merged.
# This is usually only useful for SSD-based hardware: otherwise,
# your concern is usually to get compaction to do LESS i/o (see:
# compaction_throughput_mb_per_sec), not more.
multithreaded_compaction: false
# multithreaded_compaction: false. When enabled, each compaction will
# use up to one thread per core, plus one thread per sstable being
# merged. This is usually only useful for SSD-based hardware:
# otherwise, your concern is usually to get compaction to do LESS i/o
# (see: compaction_throughput_mb_per_sec), not more.
#
# WARNING: this setting has caused compaction deadlocks for multiple
# users (see CASSANDRA-4492). It is recommended to leave this off
# unless you are prepared to help troubleshoot.
# Throttles compaction to the given total throughput across the entire
# system. The faster you insert data, the faster you need to compact in