Skip to content

Commit

Permalink
fix(manager): skip set ks strategy and rf for disrupt_mgmt_restore
Browse files Browse the repository at this point in the history
According to comment (1), set ks strategy and rf is not needed if
restoring the schema within one DC.

It should be brought back after implementation of (2) which will
unblock schema restore into a different DC. For now, it's possible
to restore schema only within one DC.

Refs:
#1: scylladb/scylla-manager#4041
issuecomment-2565489699
#2: scylladb/scylla-manager#4049
  • Loading branch information
mikliapko committed Dec 30, 2024
1 parent 2dcd3a6 commit 36704a2
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions sdcm/nemesis.py
Original file line number Diff line number Diff line change
Expand Up @@ -3081,8 +3081,14 @@ def execute_data_validation_thread(command_template, keyspace_name, number_of_ro

with ignore_ycsb_connection_refused():
self.cluster.restart_scylla() # After schema restoration, you should restart the nodes
self.tester.set_ks_strategy_to_network_and_rf_according_to_cluster(
keyspace=chosen_snapshot_info["keyspace_name"], repair_after_alter=False)

# TODO: Bring it back after the implementation of https://github.com/scylladb/scylla-manager/issues/4049
# which will unblock schema restore into a different DC. For now, we can restore schema only within one DC.
# According to https://github.com/scylladb/scylla-manager/issues/4041#issuecomment-2565489699, the step
# below is not needed if restoring the schema within one DC.
#
# self.tester.set_ks_strategy_to_network_and_rf_according_to_cluster(
# keyspace=chosen_snapshot_info["keyspace_name"], repair_after_alter=False)

restore_task = mgr_cluster.create_restore_task(restore_data=True,
location_list=location_list,
Expand Down

0 comments on commit 36704a2

Please sign in to comment.