This is an automated email from the ASF dual-hosted git repository.
smiklosovic 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 473a9605 Aligned tests with CASSANDRA-17161 - removal of
commitlog_sync_batch_window_in_ms
473a9605 is described below
commit 473a9605c0e2cc2983d5e7dae8c5695c9b43e9d2
Author: Stefan Miklosovic <[email protected]>
AuthorDate: Tue Aug 8 16:57:29 2023 +0200
Aligned tests with CASSANDRA-17161 - removal of
commitlog_sync_batch_window_in_ms
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-17161
---
commitlog_test.py | 4 ++--
configuration_test.py | 2 +-
consistency_test.py | 24 ++++++++++++------------
consistent_bootstrap_test.py | 4 ++--
json_tools_test.py | 2 +-
materialized_views_test.py | 2 +-
repair_tests/repair_test.py | 22 +++++++++++-----------
replace_address_test.py | 2 +-
replica_side_filtering_test.py | 4 ++--
9 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/commitlog_test.py b/commitlog_test.py
index 6ff11cd6..df5100bd 100644
--- a/commitlog_test.py
+++ b/commitlog_test.py
@@ -176,7 +176,7 @@ class TestCommitLog(Tester):
pytest.skip("Fixed in 3.0.7 and 3.7")
node1 = self.node1
- node1.set_batch_commitlog(enabled=True)
+ node1.set_batch_commitlog(enabled=True, use_batch_window =
self.cluster.version() < '5.0')
node1.start()
session = self.patient_cql_connection(node1)
@@ -235,7 +235,7 @@ class TestCommitLog(Tester):
Test commit log replay
"""
node1 = self.node1
- node1.set_batch_commitlog(enabled=True)
+ node1.set_batch_commitlog(enabled=True, use_batch_window =
self.cluster.version() < '5.0')
node1.start()
logger.debug("Insert data")
diff --git a/configuration_test.py b/configuration_test.py
index 235cf7ce..2acf18ec 100644
--- a/configuration_test.py
+++ b/configuration_test.py
@@ -70,7 +70,7 @@ class TestConfiguration(Tester):
# writes should block on commitlog fsync
self.fixture_dtest_setup.cluster.populate(1)
node = self.fixture_dtest_setup.cluster.nodelist()[0]
- self.fixture_dtest_setup.cluster.set_batch_commitlog(enabled=True)
+ self.fixture_dtest_setup.cluster.set_batch_commitlog(enabled=True,
use_batch_window = self.fixture_dtest_setup.cluster.version() < '5.0')
self.fixture_dtest_setup.cluster.start()
return node
diff --git a/consistency_test.py b/consistency_test.py
index cf9056bb..5d50f746 100644
--- a/consistency_test.py
+++ b/consistency_test.py
@@ -840,7 +840,7 @@ class TestConsistency(Tester):
# disable hinted handoff and set batch commit log so this doesn't
interfere with the test
# set column_index_size_in_kb to 1 for a slightly easier reproduction
sequence
cluster.set_configuration_options(values={'column_index_size_in_kb':
1, 'hinted_handoff_enabled': False})
- cluster.set_batch_commitlog(enabled=True)
+ cluster.set_batch_commitlog(enabled=True, use_batch_window =
cluster.version() < '5.0')
cluster.populate(3).start()
node1, node2, node3 = cluster.nodelist()
@@ -914,7 +914,7 @@ class TestConsistency(Tester):
# disable hinted handoff and set batch commit log so this doesn't
interfere with the test
cluster.set_configuration_options(values={'hinted_handoff_enabled':
False})
- cluster.set_batch_commitlog(enabled=True)
+ cluster.set_batch_commitlog(enabled=True, use_batch_window =
cluster.version() < '5.0')
cluster.populate(2).start()
node1, node2 = cluster.nodelist()
@@ -964,7 +964,7 @@ class TestConsistency(Tester):
# disable hinted handoff and set batch commit log so this doesn't
interfere with the test
cluster.set_configuration_options(values={'hinted_handoff_enabled':
False})
- cluster.set_batch_commitlog(enabled=True)
+ cluster.set_batch_commitlog(enabled=True, use_batch_window =
cluster.version() < '5.0')
cluster.populate(2).start()
node1, node2 = cluster.nodelist()
@@ -1018,7 +1018,7 @@ class TestConsistency(Tester):
# disable hinted handoff and set batch commit log so this doesn't
interfere with the test
cluster.set_configuration_options(values={'hinted_handoff_enabled':
False})
- cluster.set_batch_commitlog(enabled=True)
+ cluster.set_batch_commitlog(enabled=True, use_batch_window =
cluster.version() < '5.0')
cluster.populate(2).start()
node1, node2 = cluster.nodelist()
@@ -1082,7 +1082,7 @@ class TestConsistency(Tester):
# disable hinted handoff and set batch commit log so this doesn't
interfere with the test
cluster.set_configuration_options(values={'hinted_handoff_enabled':
False})
- cluster.set_batch_commitlog(enabled=True)
+ cluster.set_batch_commitlog(enabled=True, use_batch_window =
cluster.version() < '5.0')
cluster.populate(2).start()
node1, node2 = cluster.nodelist()
@@ -1143,7 +1143,7 @@ class TestConsistency(Tester):
# disable hinted handoff and set batch commit log so this doesn't
interfere with the test
cluster.set_configuration_options(values={'hinted_handoff_enabled':
False})
- cluster.set_batch_commitlog(enabled=True)
+ cluster.set_batch_commitlog(enabled=True, use_batch_window =
cluster.version() < '5.0')
cluster.populate(2).start()
node1, node2 = cluster.nodelist()
@@ -1179,7 +1179,7 @@ class TestConsistency(Tester):
# disable hinted handoff and set batch commit log so this doesn't
interfere with the test
cluster.set_configuration_options(values={'hinted_handoff_enabled':
False})
- cluster.set_batch_commitlog(enabled=True)
+ cluster.set_batch_commitlog(enabled=True, use_batch_window =
cluster.version() < '5.0')
cluster.populate(2).start()
node1, node2 = cluster.nodelist()
@@ -1233,7 +1233,7 @@ class TestConsistency(Tester):
# disable hinted handoff and set batch commit log so this doesn't
interfere with the test
cluster.set_configuration_options(values={'hinted_handoff_enabled':
False})
- cluster.set_batch_commitlog(enabled=True)
+ cluster.set_batch_commitlog(enabled=True, use_batch_window =
cluster.version() < '5.0')
cluster.populate(2)
node1, node2 = cluster.nodelist()
@@ -1297,7 +1297,7 @@ class TestConsistency(Tester):
# disable hinted handoff and set batch commit log so this doesn't
interfere with the test
cluster.set_configuration_options(values={'hinted_handoff_enabled':
False})
- cluster.set_batch_commitlog(enabled=True)
+ cluster.set_batch_commitlog(enabled=True, use_batch_window =
cluster.version() < '5.0')
cluster.populate(2).start()
node1, node2 = cluster.nodelist()
@@ -1370,7 +1370,7 @@ class TestConsistency(Tester):
# Disable hinted handoff and set batch commit log so this doesn't
# interfer with the test
cluster.set_configuration_options(values={'hinted_handoff_enabled':
False})
- cluster.set_batch_commitlog(enabled=True)
+ cluster.set_batch_commitlog(enabled=True, use_batch_window =
cluster.version() < '5.0')
cluster.populate(3).start()
node1, node2, node3 = cluster.nodelist()
@@ -1433,7 +1433,7 @@ class TestConsistency(Tester):
# Disable hinted handoff and set batch commit log so this doesn't
# interfere with the test
cluster.set_configuration_options(values={'hinted_handoff_enabled':
False})
- cluster.set_batch_commitlog(enabled=True)
+ cluster.set_batch_commitlog(enabled=True, use_batch_window =
cluster.version() < '5.0')
cluster.populate(2).start()
node1, node2 = cluster.nodelist()
@@ -1474,7 +1474,7 @@ class TestConsistency(Tester):
# Disable hinted handoff and set batch commit log so this doesn't
# interfere with the test
cluster.set_configuration_options(values={'hinted_handoff_enabled':
False})
- cluster.set_batch_commitlog(enabled=True)
+ cluster.set_batch_commitlog(enabled=True, use_batch_window =
cluster.version() < '5.0')
cluster.populate(3).start()
node1, node2, node3 = cluster.nodelist()
diff --git a/consistent_bootstrap_test.py b/consistent_bootstrap_test.py
index e995988a..b9fbba36 100644
--- a/consistent_bootstrap_test.py
+++ b/consistent_bootstrap_test.py
@@ -20,7 +20,7 @@ class TestBootstrapConsistency(Tester):
'write_request_timeout_in_ms': 60000,
'read_request_timeout_in_ms': 60000,
'dynamic_snitch_badness_threshold': 0.0})
- cluster.set_batch_commitlog(enabled=True)
+ cluster.set_batch_commitlog(enabled=True, use_batch_window =
cluster.version() < '5.0')
cluster.populate(3, tokens=[0, 2**48, 2**62]).start()
node1, node2, node3 = cluster.nodelist()
@@ -61,7 +61,7 @@ class TestBootstrapConsistency(Tester):
'write_request_timeout_in_ms': 60000,
'read_request_timeout_in_ms': 60000,
'dynamic_snitch_badness_threshold': 0.0})
- cluster.set_batch_commitlog(enabled=True)
+ cluster.set_batch_commitlog(enabled=True, use_batch_window =
cluster.version() < '5.0')
cluster.populate(2)
node1, node2 = cluster.nodelist()
diff --git a/json_tools_test.py b/json_tools_test.py
index 61c2815a..367116f1 100644
--- a/json_tools_test.py
+++ b/json_tools_test.py
@@ -18,7 +18,7 @@ class TestJson(Tester):
logger.debug("Starting cluster...")
cluster = self.cluster
- cluster.set_batch_commitlog(enabled=True)
+ cluster.set_batch_commitlog(enabled=True, use_batch_window =
cluster.version() < '5.0')
cluster.populate(1).start()
logger.debug("Version: " + cluster.version().vstring)
diff --git a/materialized_views_test.py b/materialized_views_test.py
index a44f6742..4f0d6001 100644
--- a/materialized_views_test.py
+++ b/materialized_views_test.py
@@ -2558,7 +2558,7 @@ class TestMaterializedViews(Tester):
@jira_ticket CASSANDRA-13069
"""
- self.cluster.set_batch_commitlog(enabled=True)
+ self.cluster.set_batch_commitlog(enabled=True, use_batch_window =
self.cluster.version() < '5.0')
self.fixture_dtest_setup.ignore_log_patterns = [r'Dummy failure',
r"Failed to force-recycle all segments"]
self.prepare(rf=1, install_byteman=True)
node1, node2, node3 = self.cluster.nodelist()
diff --git a/repair_tests/repair_test.py b/repair_tests/repair_test.py
index 6c31f6b1..87e265a3 100644
--- a/repair_tests/repair_test.py
+++ b/repair_tests/repair_test.py
@@ -95,7 +95,7 @@ class BaseRepairTest(Tester):
# Disable hinted handoff and set batch commit log so this doesn't
# interfere with the test (this must be after the populate)
cluster.set_configuration_options(values={'hinted_handoff_enabled':
False})
- cluster.set_batch_commitlog(enabled=True)
+ cluster.set_batch_commitlog(enabled=True, use_batch_window =
cluster.version() < '5.0')
logger.debug("Starting cluster..")
cluster.populate(3).start()
node1, node2, node3 = cluster.nodelist()
@@ -463,7 +463,7 @@ class TestRepair(BaseRepairTest):
cluster = self.cluster
cluster.populate(2)
cluster.set_configuration_options(values={'hinted_handoff_enabled':
False})
- cluster.set_batch_commitlog(enabled=True)
+ cluster.set_batch_commitlog(enabled=True, use_batch_window =
cluster.version() < '5.0')
cluster.start()
node1, node2 = cluster.nodelist()
@@ -588,7 +588,7 @@ class TestRepair(BaseRepairTest):
cluster = self.cluster
cluster.populate(2)
cluster.set_configuration_options(values={'hinted_handoff_enabled':
False})
- cluster.set_batch_commitlog(enabled=True)
+ cluster.set_batch_commitlog(enabled=True, use_batch_window =
cluster.version() < '5.0')
cluster.start()
node1, node2 = cluster.nodelist()
@@ -750,7 +750,7 @@ class TestRepair(BaseRepairTest):
# Disable hinted handoff and set batch commit log so this doesn't
# interfer with the test (this must be after the populate)
cluster.set_configuration_options(values={'hinted_handoff_enabled':
False})
- cluster.set_batch_commitlog(enabled=True)
+ cluster.set_batch_commitlog(enabled=True, use_batch_window =
cluster.version() < '5.0')
logger.debug("Starting cluster..")
# populate 2 nodes in dc1, and one node each in dc2 and dc3
cluster.populate([2, 1, 1]).start()
@@ -836,7 +836,7 @@ class TestRepair(BaseRepairTest):
"""
cluster = self.cluster
cluster.set_configuration_options(values={'hinted_handoff_enabled':
False})
- cluster.set_batch_commitlog(enabled=True)
+ cluster.set_batch_commitlog(enabled=True, use_batch_window =
cluster.version() < '5.0')
logger.debug("Starting cluster..")
cluster.populate(3).start()
@@ -860,7 +860,7 @@ class TestRepair(BaseRepairTest):
"""
cluster = self.cluster
cluster.set_configuration_options(values={'hinted_handoff_enabled':
False})
- cluster.set_batch_commitlog(enabled=True)
+ cluster.set_batch_commitlog(enabled=True, use_batch_window =
cluster.version() < '5.0')
logger.debug("Starting cluster..")
cluster.populate(3).start()
@@ -909,7 +909,7 @@ class TestRepair(BaseRepairTest):
"""
cluster = self.cluster
cluster.set_configuration_options(values={'hinted_handoff_enabled':
False})
- cluster.set_batch_commitlog(enabled=True)
+ cluster.set_batch_commitlog(enabled=True, use_batch_window =
cluster.version() < '5.0')
logger.debug("Starting cluster..")
cluster.populate(3).start()
@@ -933,7 +933,7 @@ class TestRepair(BaseRepairTest):
"""
cluster = self.cluster
cluster.set_configuration_options(values={'hinted_handoff_enabled':
False})
- cluster.set_batch_commitlog(enabled=True)
+ cluster.set_batch_commitlog(enabled=True, use_batch_window =
cluster.version() < '5.0')
logger.debug("Starting cluster..")
cluster.populate(3).start()
@@ -1063,7 +1063,7 @@ class TestRepair(BaseRepairTest):
"""
cluster = self.cluster
cluster.set_configuration_options(values={'hinted_handoff_enabled':
False})
- cluster.set_batch_commitlog(enabled=True)
+ cluster.set_batch_commitlog(enabled=True, use_batch_window =
cluster.version() < '5.0')
logger.debug("Starting cluster..")
cluster.populate(3).start()
@@ -1106,7 +1106,7 @@ class TestRepair(BaseRepairTest):
"""
cluster = self.cluster
cluster.set_configuration_options(values={'hinted_handoff_enabled':
False})
- cluster.set_batch_commitlog(enabled=True)
+ cluster.set_batch_commitlog(enabled=True, use_batch_window =
cluster.version() < '5.0')
logger.debug("Starting cluster..")
cluster.populate(3).start()
@@ -1282,7 +1282,7 @@ class TestRepair(BaseRepairTest):
# Disable hinted handoff and set batch commit log so this doesn't
# interfere with the test (this must be after the populate)
cluster.set_configuration_options(values={'hinted_handoff_enabled':
False})
- cluster.set_batch_commitlog(enabled=True)
+ cluster.set_batch_commitlog(enabled=True, use_batch_window =
cluster.version() < '5.0')
logger.debug("Setting up cluster..")
cluster.populate(3)
node1, node2, node3 = cluster.nodelist()
diff --git a/replace_address_test.py b/replace_address_test.py
index 0bcfbf07..547923c6 100644
--- a/replace_address_test.py
+++ b/replace_address_test.py
@@ -49,7 +49,7 @@ class BaseReplaceAddressTest(Tester):
logger.debug("Setting cluster options: {}".format(opts))
self.cluster.set_configuration_options(opts)
- self.cluster.set_batch_commitlog(enabled=True)
+ self.cluster.set_batch_commitlog(enabled=True, use_batch_window =
self.cluster.version() < '5.0')
self.query_node = self.cluster.nodelist()[0]
self.replaced_node = self.cluster.nodelist()[-1]
diff --git a/replica_side_filtering_test.py b/replica_side_filtering_test.py
index 4739ae3c..0a86d268 100644
--- a/replica_side_filtering_test.py
+++ b/replica_side_filtering_test.py
@@ -31,7 +31,7 @@ class ReplicaSideFiltering(Tester):
# Disable hinted handoff and set batch commit log so this doesn't
interfere with the test
if only_node1 or only_node2:
cluster.set_configuration_options(values={'hinted_handoff_enabled': False})
- cluster.set_batch_commitlog(enabled=True)
+ cluster.set_batch_commitlog(enabled=True, use_batch_window =
cluster.version() < '5.0')
cluster.populate(2)
node1, node2 = cluster.nodelist()
@@ -523,7 +523,7 @@ class TestAllowFiltering(ReplicaSideFiltering):
'commitlog_sync_period_in_ms': 500,
'enable_transient_replication': True,
'partitioner':
'org.apache.cassandra.dht.OrderPreservingPartitioner'})
- cluster.set_batch_commitlog(enabled=True)
+ cluster.set_batch_commitlog(enabled=True, use_batch_window =
cluster.version() < '5.0')
cluster.populate(2, tokens=[0, 1], debug=True, install_byteman=True)
node1, node2 = cluster.nodelist()
cluster.start()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
