From 4bb6f411d8c7620aa330fd97a7d0af5973936893 Mon Sep 17 00:00:00 2001 From: Ekaterina Dimitrova Date: Tue, 9 Nov 2021 15:39:56 -0500 Subject: [PATCH] Fix cassandra.yaml formatting of parameters patch by Ekaterina Dimitrova; reviewed by Josh McKenzie for CASSANDRA-17131 --- CHANGES.txt | 1 + conf/cassandra.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 3f6bacdf25..3994ede540 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0.2 + * Fix cassandra.yaml formatting of parameters (CASSANDRA-17131) * Add backward compatibility for CQLSSTableWriter Date fields (CASSANDRA-17117) * Push initial client connection messages to trace (CASSANDRA-17038) * Correct the internode message timestamp if sending node has wrapped (CASSANDRA-16997) diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index 2af8fc43d3..f8f898be88 100644 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@ -935,20 +935,20 @@ request_timeout_in_ms: 10000 # See (CASSANDRA-14358) for details. # # The amount of time to wait for internode tcp connections to establish. -# internode_tcp_connect_timeout_in_ms = 2000 +# internode_tcp_connect_timeout_in_ms: 2000 # # The amount of time unacknowledged data is allowed on a connection before we throw out the connection # Note this is only supported on Linux + epoll, and it appears to behave oddly above a setting of 30000 # (it takes much longer than 30s) as of Linux 4.12. If you want something that high set this to 0 # which picks up the OS default and configure the net.ipv4.tcp_retries2 sysctl to be ~8. -# internode_tcp_user_timeout_in_ms = 30000 +# internode_tcp_user_timeout_in_ms: 30000 # The amount of time unacknowledged data is allowed on a streaming connection. # The default is 5 minutes. Increase it or set it to 0 in order to increase the timeout. -# internode_streaming_tcp_user_timeout_in_ms = 300000 +# internode_streaming_tcp_user_timeout_in_ms: 300000 # The maximum continuous period a connection may be unwritable in application space -# internode_application_timeout_in_ms = 30000 +# internode_application_timeout_in_ms: 30000 # Global, per-endpoint and per-connection limits imposed on messages queued for delivery to other nodes # and waiting to be processed on arrival from other nodes in the cluster. These limits are applied to the on-wire