This is an automated email from the ASF dual-hosted git repository.
mck 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 345a9328 more accurate version checks for native_transport_timeout
from CASSANDRA-19534
345a9328 is described below
commit 345a93287783c0663b3b5236f209a7f5d20c6afd
Author: Mick Semb Wever <[email protected]>
AuthorDate: Tue May 6 10:17:09 2025 +0200
more accurate version checks for native_transport_timeout from
CASSANDRA-19534
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-20625
---
cql_tracing_test.py | 2 +-
pushed_notifications_test.py | 2 +-
read_repair_test.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cql_tracing_test.py b/cql_tracing_test.py
index 6a7a7419..881557df 100644
--- a/cql_tracing_test.py
+++ b/cql_tracing_test.py
@@ -27,7 +27,7 @@ class TestCqlTracing(Tester):
cluster = self.cluster
opts = {'write_request_timeout_in_ms': 30000,
'read_request_timeout_in_ms': 30000}
- if self.cluster.version() >= LooseVersion('4.1'):
+ if str(cluster.cassandra_version()) >= '4.1.6' and not
str(cluster.cassandra_version()).startswith(('5.0-alpha', '5.0-beta')):
opts['native_transport_timeout'] = '30s'
cluster.set_configuration_options(values=opts);
diff --git a/pushed_notifications_test.py b/pushed_notifications_test.py
index 581b0ea5..8b278ccf 100644
--- a/pushed_notifications_test.py
+++ b/pushed_notifications_test.py
@@ -392,7 +392,7 @@ class TestVariousNotifications(Tester):
'read_request_timeout_in_ms': 30000, # 30 seconds
'range_request_timeout_in_ms': 40000
}
- if self.cluster.version() >= LooseVersion('4.1'):
+ if self.cluster.cassandra_version() >= LooseVersion('4.1.6') and not
str(self.cluster.cassandra_version()).startswith(('5.0-alpha', '5.0-beta')):
opts['native_transport_timeout'] = '30s'
self.cluster.set_configuration_options(values=opts)
self.cluster.populate(3).start()
diff --git a/read_repair_test.py b/read_repair_test.py
index 0a518131..5a81e639 100644
--- a/read_repair_test.py
+++ b/read_repair_test.py
@@ -394,7 +394,7 @@ class TestReadRepair(Tester):
cluster = self.cluster
cluster.populate(3)
opts = {'write_request_timeout_in_ms': 30000,
'read_request_timeout_in_ms': 30000}
- if cluster.version() >= LooseVersion('4.1'):
+ if cluster.cassandra_version() >= LooseVersion('4.1.6') and not
str(cluster.cassandra_version()).startswith(('5.0-alpha', '5.0-beta')):
opts['native_transport_timeout'] = '30s'
cluster.set_configuration_options(values=opts)
cluster.set_partitioner("org.apache.cassandra.dht.RandomPartitioner")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
