You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2022/11/14 18:00:43 UTC
[cassandra-dtest] branch trunk updated: Enable bootstrap resuming on replacement nodes in replace_address_test
This is an automated email from the ASF dual-hosted git repository.
jmckenzie 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 7f2b8eda Enable bootstrap resuming on replacement nodes in replace_address_test
7f2b8eda is described below
commit 7f2b8eda5c52fb6f637aa7166e2d48cd34a64eec
Author: Josh McKenzie <jm...@apache.org>
AuthorDate: Fri Nov 4 14:38:31 2022 -0400
Enable bootstrap resuming on replacement nodes in replace_address_test
Also fix materialized_views_test.TestMaterializedViews.test_add_dc_after_mv_network_replication
Patch by Josh McKenzie; reviewed by Brandon Williams for CASSANDRA-17679
---
materialized_views_test.py | 10 +++++++---
replace_address_test.py | 8 +++++++-
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/materialized_views_test.py b/materialized_views_test.py
index 6a039480..9d31db61 100644
--- a/materialized_views_test.py
+++ b/materialized_views_test.py
@@ -57,7 +57,7 @@ class TestMaterializedViews(Tester):
cluster.populate([nodes, 0], install_byteman=install_byteman)
if options:
cluster.set_configuration_options(values=options)
- cluster.start()
+ cluster.start(jvm_args=['-Dcassandra.reset_bootstrap_progress=false'])
node1 = cluster.nodelist()[0]
session = self.patient_cql_connection(node1, **kwargs)
@@ -541,11 +541,15 @@ class TestMaterializedViews(Tester):
logger.debug("Bootstrapping new node in another dc")
node4 = new_node(self.cluster, data_center='dc2')
- node4.start(wait_for_binary_proto=True, jvm_args=["-Dcassandra.migration_task_wait_in_seconds={}".format(MIGRATION_WAIT)])
+ node4.start(wait_for_binary_proto=True,
+ jvm_args=["-Dcassandra.migration_task_wait_in_seconds={}".format(MIGRATION_WAIT),
+ "-Dcassandra.reset_bootstrap_progress=false"])
logger.debug("Bootstrapping new node in another dc")
node5 = new_node(self.cluster, remote_debug_port='1414', data_center='dc2')
- node5.start(jvm_args=["-Dcassandra.migration_task_wait_in_seconds={}".format(MIGRATION_WAIT)], wait_for_binary_proto=True)
+ node5.start(jvm_args=["-Dcassandra.migration_task_wait_in_seconds={}".format(MIGRATION_WAIT),
+ "-Dcassandra.reset_bootstrap_progress=false"],
+ wait_for_binary_proto=True)
if nts:
session.execute("alter keyspace ks with replication = {'class':'NetworkTopologyStrategy', 'dc1':1, 'dc2':1}")
session.execute("alter keyspace system_auth with replication = {'class':'NetworkTopologyStrategy', 'dc1':1, 'dc2':1}")
diff --git a/replace_address_test.py b/replace_address_test.py
index 799f42c4..0bcfbf07 100644
--- a/replace_address_test.py
+++ b/replace_address_test.py
@@ -79,6 +79,11 @@ class BaseReplaceAddressTest(Tester):
wait_other_notice=False, wait_for_binary_proto=True,
replace_address=None, opts=None, data_center=None,
extra_jvm_args=None):
+ """
+ This explicitly starts the replacement node with reset_bootstrap_progress=false as the tests were originally
+ authored in a pre 5.0 world where bootstrap resume was enabled by default. As tests that exercise this functionality
+ explicitly set it or assume a world with this config, we should be in good shape.
+ """
if replace_address is None:
replace_address = self.replaced_node.address()
if data_center is None:
@@ -104,7 +109,8 @@ class BaseReplaceAddressTest(Tester):
extra_jvm_args = []
extra_jvm_args.extend(["-Dcassandra.{}={}".format(jvm_option, replace_address),
"-Dcassandra.ring_delay_ms=10000",
- "-Dcassandra.broadcast_interval_ms=10000"])
+ "-Dcassandra.broadcast_interval_ms=10000",
+ "-Dcassandra.reset_bootstrap_progress=false"])
self.replacement_node.start(jvm_args=extra_jvm_args,
wait_for_binary_proto=wait_for_binary_proto, wait_other_notice=wait_other_notice)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org