Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 1aea6d591 -> 5aee12883 refs/heads/cassandra-2.1.0 c4191ed1c -> af646fb75 refs/heads/trunk b42a15b89 -> 8bd1bf664
ninja fix cassandra.yaml missing memtable_(off)?heap_size_in_mb Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/af646fb7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af646fb7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/af646fb7 Branch: refs/heads/cassandra-2.1 Commit: af646fb759eda76e3bd82f1a7beff7bf49a2654a Parents: c4191ed Author: Benedict Elliott Smith <bened...@apache.org> Authored: Thu Aug 21 08:52:40 2014 +0700 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Thu Aug 21 08:52:40 2014 +0700 ---------------------------------------------------------------------- conf/cassandra.yaml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/af646fb7/conf/cassandra.yaml ---------------------------------------------------------------------- diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index 0299d75..060be64 100644 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@ -276,10 +276,12 @@ concurrent_counter_writes: 32 # the smaller of 1/4 of heap or 512MB. # file_cache_size_in_mb: 512 -# Total memory to use for memtables. Cassandra will flush the largest -# memtable when this much memory is used. -# If omitted, Cassandra will set it to 1/4 of the heap. -# memtable_total_space_in_mb: 2048 +# Total permitted memory to use for memtables. Cassandra will stop +# accepting writes when the limit is exceeded until a flush completes, +# and will trigger a flush based on memtable_cleanup_threshold +# If omitted, Cassandra will set both to 1/4 the size of the heap. +# memtable_heap_space_in_mb: 2048 +# memtable_offheap_space_in_mb: 2048 # Ratio of occupied non-flushing memtable size to total permitted size # that will trigger a flush of the largest memtable. Lager mct will @@ -288,7 +290,7 @@ concurrent_counter_writes: 32 # under heavy write load. # # memtable_cleanup_threshold defaults to 1 / (memtable_flush_writers + 1) -#memtable_cleanup_threshold: 0.11 +# memtable_cleanup_threshold: 0.11 # Specify the way Cassandra allocates and manages memtable memory. # Options are:
