Update cassandra.yaml documentation for batch_size thresholds Take account of changes in CASSANDRA-10876
Patch by Guy Bolton King; reviewed by Joel Knighton for CASSANDRA-12761 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e7220464 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7220464 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e7220464 Branch: refs/heads/trunk Commit: e722046406bb2c037a96ea9605e0e4878e49e596 Parents: 206a7bb Author: Guy Bolton King <g...@waftex.com> Authored: Tue Sep 20 14:55:24 2016 +0100 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Oct 14 17:14:57 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra.yaml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7220464/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 0045ba5..5023590 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.10 + * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes in CASSANDRA-10876 (CASSANDRA-12761) * cqlsh fails to format collections when using aliases (CASSANDRA-11534) * Check for hash conflicts in prepared statements (CASSANDRA-12733) * Exit query parsing upon first error (CASSANDRA-12598) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7220464/conf/cassandra.yaml ---------------------------------------------------------------------- diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index 8a0b3ee..986913b 100644 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@ -1150,11 +1150,11 @@ transparent_data_encryption_options: tombstone_warn_threshold: 1000 tombstone_failure_threshold: 100000 -# Log WARN on any batch size exceeding this value. 5kb per batch by default. +# Log WARN on any multiple-partition batch size exceeding this value. 5kb per batch by default. # Caution should be taken on increasing the size of this threshold as it can lead to node instability. batch_size_warn_threshold_in_kb: 5 -# Fail any batch exceeding this value. 50kb (10x warn threshold) by default. +# Fail any multiple-partition batch exceeding this value. 50kb (10x warn threshold) by default. batch_size_fail_threshold_in_kb: 50 # Log WARN on any batches not of type LOGGED than span across more partitions than this limit
