diff --git a/cql_tracing_test.py b/cql_tracing_test.py index 38b9d48291..6a7a741964 100644 --- a/cql_tracing_test.py +++ b/cql_tracing_test.py @@ -26,8 +26,10 @@ def prepare(self, create_keyspace=True, nodes=3, rf=3, protocol_version=3, jvm_a 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 260a49959e..581b0ea50f 100644 --- a/pushed_notifications_test.py +++ b/pushed_notifications_test.py @@ -387,13 +387,14 @@ def test_tombstone_failure_threshold_message(self): 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 8ec813d6ed..2e5335494c 100644 --- a/read_repair_test.py +++ b/read_repair_test.py @@ -393,8 +393,10 @@ def test_tracing_does_not_interfere_with_digest_calculation(self): """ 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'])