You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2024/06/11 14:00:12 UTC

(cassandra-dtest) branch trunk updated: set native_transport_timeout after CASSANDRA-19534

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-dtest.git


The following commit(s) were added to refs/heads/trunk by this push:
     new eb92fca7 set native_transport_timeout after CASSANDRA-19534
eb92fca7 is described below

commit eb92fca7c38ae00879d4a3cd91896bf619bc2d94
Author: Brandon Williams <br...@apache.org>
AuthorDate: Thu Jun 6 15:27:00 2024 -0500

    set native_transport_timeout after CASSANDRA-19534
    
    Patch by brandonwilliams; reviewed by smiklosovic for CASSANDRA-19683
---
 cql_tracing_test.py          |  6 ++++--
 pushed_notifications_test.py | 15 ++++++++-------
 read_repair_test.py          |  6 ++++--
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/cql_tracing_test.py b/cql_tracing_test.py
index 38b9d482..6a7a7419 100644
--- a/cql_tracing_test.py
+++ b/cql_tracing_test.py
@@ -26,8 +26,10 @@ class TestCqlTracing(Tester):
         jvm_args.append('-Dcassandra.wait_for_tracing_events_timeout_secs=15')
 
         cluster = self.cluster
-        cluster.set_configuration_options(values={'write_request_timeout_in_ms': 30000,
-                                          'read_request_timeout_in_ms': 30000})
+        opts = {'write_request_timeout_in_ms': 30000, 'read_request_timeout_in_ms': 30000}
+        if self.cluster.version() >= LooseVersion('4.1'):
+            opts['native_transport_timeout'] = '30s'
+        cluster.set_configuration_options(values=opts);
 
         if random_partitioner:
             cluster.set_partitioner("org.apache.cassandra.dht.RandomPartitioner")
diff --git a/pushed_notifications_test.py b/pushed_notifications_test.py
index 260a4995..581b0ea5 100644
--- a/pushed_notifications_test.py
+++ b/pushed_notifications_test.py
@@ -387,13 +387,14 @@ class TestVariousNotifications(Tester):
         have_v5_protocol = self.supports_v5_protocol(self.cluster.version())
 
         self.fixture_dtest_setup.allow_log_errors = True
-        self.cluster.set_configuration_options(
-            values={
-                'tombstone_failure_threshold': 500,
-                'read_request_timeout_in_ms': 30000,  # 30 seconds
-                'range_request_timeout_in_ms': 40000
-            }
-        )
+        opts={
+            'tombstone_failure_threshold': 500,
+            'read_request_timeout_in_ms': 30000,  # 30 seconds
+            'range_request_timeout_in_ms': 40000
+        }
+        if self.cluster.version() >= LooseVersion('4.1'):
+            opts['native_transport_timeout'] = '30s'
+        self.cluster.set_configuration_options(values=opts)
         self.cluster.populate(3).start()
         node1, node2, node3 = self.cluster.nodelist()
         proto_version = 5 if have_v5_protocol else None
diff --git a/read_repair_test.py b/read_repair_test.py
index 8ec813d6..2e533549 100644
--- a/read_repair_test.py
+++ b/read_repair_test.py
@@ -393,8 +393,10 @@ class TestReadRepair(Tester):
         """
         cluster = self.cluster
         cluster.populate(3)
-        cluster.set_configuration_options(values={'write_request_timeout_in_ms': 30000,
-                                                  'read_request_timeout_in_ms': 30000})
+        opts = {'write_request_timeout_in_ms': 30000, 'read_request_timeout_in_ms': 30000}
+        if cluster.version() >= LooseVersion('4.1'):
+            opts['native_transport_timeout'] = '30s'
+        cluster.set_configuration_options(values=opts)
         cluster.set_partitioner("org.apache.cassandra.dht.RandomPartitioner")
         cluster.start(jvm_args=['-Dcassandra.wait_for_tracing_events_timeout_secs=15'])
 


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