From c8a5a8ab783b0316a130736788cdd0016fccd3af Mon Sep 17 00:00:00 2001 From: Liapkovich Date: Mon, 30 Dec 2024 17:25:15 +0100 Subject: [PATCH] fix(manager): skip set ks strategy and rf for disrupt_mgmt_restore 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: https://github.com/scylladb/scylla-manager/issues/4041# issuecomment-2565489699 #2: https://github.com/scylladb/scylla-manager/issues/4049 (cherry picked from commit b16189030f9a71aa64478e7e1f9bac8a96c2d656) --- sdcm/nemesis.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sdcm/nemesis.py b/sdcm/nemesis.py index 62534029e7..9767c6d6e8 100644 --- a/sdcm/nemesis.py +++ b/sdcm/nemesis.py @@ -2977,8 +2977,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,