Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bootstrap_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -415,8 +415,8 @@ def test_bootstrap_with_reset_bootstrap_state(self):
node3.start(jvm_args=["-Dcassandra.reset_bootstrap_progress=true"])
# check if we reset bootstrap state
node3.watch_log_for("Resetting bootstrap progress to start fresh", from_mark=mark)
# wait for node3 ready to query
node3.wait_for_binary_interface(from_mark=mark)
# wait for node3 ready to query, 180s as the node needs to bootstrap
node3.wait_for_binary_interface(from_mark=mark, timeout=180)

# check if 2nd bootstrap succeeded
assert_bootstrap_state(self, node3, 'COMPLETED')
Expand Down
4 changes: 2 additions & 2 deletions cdc_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ def _init_new_loading_node(self, ks_name, create_stmt, use_thrift=False):
logger.debug('adding node')
self.cluster.add(loading_node, is_seed=True)
logger.debug('starting new node')
loading_node.start(wait_for_binary_proto=True)
loading_node.start(wait_for_binary_proto=120)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

instead of increasing timeout we could use some magical flag
to skip seed node2 seed connection checking (as node1 is down and node2 is also a seed).
this is new "safety guard" in C* 4.0, but I have not found any switch to turn it off...

I was considering to make timeout conditional for 4.0 but this would imo bring a little value with added code complexity

logger.debug('recreating ks and table')
loading_session = self.patient_exclusive_cql_connection(loading_node)
create_ks(loading_session, ks_name, rf=1)
Expand Down Expand Up @@ -615,7 +615,7 @@ def test_cdc_data_available_in_cdc_raw(self):
os.path.join(generation_node.get_path(), 'cdc_raw'),
os.path.join(loading_node.get_path(), 'commitlogs')
)
loading_node.start(wait_for_binary_proto=True)
loading_node.start(wait_for_binary_proto=120)
logger.debug('node successfully started; waiting on log replay')
loading_node.grep_log('Log replay complete')
logger.debug('log replay complete')
Expand Down
2 changes: 1 addition & 1 deletion disk_balance_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def _test_disk_balance_replace(self, same_address):
binary_interface=(node5_address, 9042))
self.cluster.add(node5, False)
node5.start(jvm_args=["-Dcassandra.replace_address_first_boot={}".format(node2.address())],
wait_for_binary_proto=True,
wait_for_binary_proto=180,
wait_other_notice=True)

logger.debug("Checking replacement node is balanced")
Expand Down
4 changes: 2 additions & 2 deletions replace_address_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -484,13 +484,13 @@ def _test_restart_failed_replace(self, mode):
if mode == 'reset_resume_state':
mark = self.replacement_node.mark_log()
logger.debug("Restarting replacement node with -Dcassandra.reset_bootstrap_progress=true")
# restart replacement node with resetting bootstrap state
# restart replacement node with resetting bootstrap state (with 180s timeout)
self.replacement_node.stop()
self.replacement_node.start(jvm_args=[
"-Dcassandra.replace_address_first_boot={}".format(self.replaced_node.address()),
"-Dcassandra.reset_bootstrap_progress=true"
],
wait_for_binary_proto=True)
wait_for_binary_proto=180)
# check if we reset bootstrap state
self.replacement_node.watch_log_for("Resetting bootstrap progress to start fresh", from_mark=mark)
elif mode == 'resume':
Expand Down