fix: slave重建安装周边包括安装主节点周边 TencentBlueKing#8754

zfrendo · Dec 23, 2024 · d77a573 · d77a573
1 parent 90d6b2b
commit d77a573
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/mysql/mysql_restore_slave_remote_flow.py b/dbm-ui/backend/flow/engine/bamboo/scene/mysql/mysql_restore_slave_remote_flow.py
@@ -385,11 +385,11 @@ def tendb_ha_restore_slave_flow(self):
                 tendb_migrate_pipeline.add_sub_pipeline(
                     sub_flow=build_surrounding_apps_sub_flow(
                         bk_cloud_id=cluster_class.bk_cloud_id,
-                        master_ip_list=None,
-                        slave_ip_list=[self.data["new_slave_ip"], master.machine.ip],
+                        master_ip_list=[master.machine.ip],
+                        slave_ip_list=[self.data["new_slave_ip"]],
                         root_id=self.root_id,
                         parent_global_data=copy.deepcopy(self.data),
-                        is_init=True,
+                        is_init=False,
                         cluster_type=ClusterType.TenDBHA.value,
                     )
                 )
@@ -630,8 +630,8 @@ def restore_local_slave_flow(self):
             tendb_migrate_pipeline.add_sub_pipeline(
                 sub_flow=build_surrounding_apps_sub_flow(
                     bk_cloud_id=cluster_model.bk_cloud_id,
-                    master_ip_list=None,
-                    slave_ip_list=[target_slave.machine.ip, master.machine.ip],
+                    master_ip_list=[master.machine.ip],
+                    slave_ip_list=[target_slave.machine.ip],
                     root_id=self.root_id,
                     parent_global_data=copy.deepcopy(self.data),
                     cluster_type=ClusterType.TenDBHA.value,

diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/spider/remote_local_slave_recover.py b/dbm-ui/backend/flow/engine/bamboo/scene/spider/remote_local_slave_recover.py
@@ -264,8 +264,8 @@ def tendb_remote_slave_local_recover(self):
             tendb_migrate_pipeline.add_sub_pipeline(
                 sub_flow=build_surrounding_apps_sub_flow(
                     bk_cloud_id=cluster_class.bk_cloud_id,
-                    master_ip_list=None,
-                    slave_ip_list=[self.data["slave_ip"], self.data["master_ip"]],
+                    master_ip_list=[self.data["master_ip"]],
+                    slave_ip_list=[self.data["slave_ip"]],
                     root_id=self.root_id,
                     parent_global_data=copy.deepcopy(self.data),
                     cluster_type=cluster_class.cluster_type,

diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/spider/remote_slave_recover.py b/dbm-ui/backend/flow/engine/bamboo/scene/spider/remote_slave_recover.py
@@ -309,10 +309,11 @@ def tendb_remote_slave_recover(self):
             re_surrounding_sub_pipeline.add_sub_pipeline(
                 sub_flow=build_surrounding_apps_sub_flow(
                     bk_cloud_id=cluster_class.bk_cloud_id,
-                    slave_ip_list=[self.data["target_ip"], master.machine.ip],
+                    master_ip_list=[master.machine.ip],
+                    slave_ip_list=[self.data["target_ip"]],
                     root_id=self.root_id,
                     parent_global_data=copy.deepcopy(self.data),
-                    is_init=True,
+                    is_init=False,
                     cluster_type=ClusterType.TenDBCluster.value,
                 )
             )