[cassandra] branch trunk updated: Set cross_node_timeout to true by default.

[br...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 9d2ffad  Set cross_node_timeout to true by default.
9d2ffad is described below

commit 9d2ffad6b6d09761a03aeb1a207e9780d1174046
Author: Ekaterina Dimitrova <ek...@datastax.com>
AuthorDate: Mon Jan 13 14:29:38 2020 -0500

    Set cross_node_timeout to true by default.
    
    Patch by Ekaterina Dimitrova, reviewed by brandonwilliams for
    CASSANDRA-15216
---
 CHANGES.txt                                      | 4 ++++
 NEWS.txt                                         | 6 ++++++
 conf/cassandra.yaml                              | 6 +++---
 src/java/org/apache/cassandra/config/Config.java | 2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b6d140c..522edf8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,6 +14,10 @@
  * Add documentation for Java 11 support in Cassandra (CASSANDRA-15428)
  * Integrate SJK into nodetool (CASSANDRA-12197)
  * Ensure that empty clusterings with kind==CLUSTERING are Clustering.EMPTY (CASSANDRA-15498)
+ * The flag 'cross_node_timeout' has been set as true by default. This change
+   is done under the assumption that users have setup NTP on their clusters or
+   otherwise synchronize their clocks, and that clocks are mostly in sync, since
+   this is a requirement for general correctness of last write wins. (CASSANDRA-15216)
 Merged from 3.11:
  * Fix nodetool compactionstats showing extra pending task for TWCS - patch implemented (CASSANDRA-15409)
  * Fix SELECT JSON formatting for the "duration" type (CASSANDRA-15075)
diff --git a/NEWS.txt b/NEWS.txt
index 86de7a4..e51203f 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -218,6 +218,12 @@ Upgrading
       have been set as false by default. Operators should modify them to allow the
       creation of new views and SASI indexes, the existing ones will continue working.
       See CASSANDRA-14866 for details.
+    - CASSANDRA-15216 - The flag 'cross_node_timeout' has been set as true by default.
+      This change is done under the assumption that users have setup NTP on
+      their clusters or otherwise synchronize their clocks, and that clocks are
+      mostly in sync, since this is a requirement for general correctness of
+      last write wins.
+
 
 Materialized Views
 -------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 9a79f24..f1e5864 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -923,9 +923,9 @@ slow_query_log_timeout_in_ms: 500
 # under overload conditions we will waste that much extra time processing 
 # already-timed-out requests.
 #
-# Warning: before enabling this property make sure to ntp is installed
-# and the times are synchronized between the nodes.
-cross_node_timeout: false
+# Warning: It is generally assumed that users have setup NTP on their clusters, and that clocks are modestly in sync, 
+# since this is a requirement for general correctness of last write wins.
+#cross_node_timeout: true
 
 # Set keep-alive period for streaming
 # This node will send a keep-alive message periodically with this period.
diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java
index 8fa8e72..2d74426 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -108,7 +108,7 @@ public class Config
     public Integer streaming_connections_per_host = 1;
     public Integer streaming_keep_alive_period_in_secs = 300; //5 minutes
 
-    public boolean cross_node_timeout = false;
+    public boolean cross_node_timeout = true;
 
     public volatile long slow_query_log_timeout_in_ms = 500L;
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org