fix(mysql): 回退标准化改动 TencentBlueKing#7644

xfwduke · Oct 29, 2024 · ad5662f · ad5662f
1 parent 7ef55c9
commit ad5662f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/mysql/mysql_ha_standardize_flow.py b/dbm-ui/backend/flow/engine/bamboo/scene/mysql/mysql_ha_standardize_flow.py
@@ -81,6 +81,8 @@ def standardize(self):
             need_random_pass_cluster_ids=list(set(self.data["infos"]["cluster_ids"])),
         )
 
+        standardize_pipe.add_sub_pipeline(self._build_trans_module_sub(clusters=cluster_objects))
+
         standardize_pipe.add_sub_pipeline(self._build_instantiate_mysql_config_sub(clusters=cluster_objects))
 
         # 为了代码方便这里稍微特殊点
@@ -114,8 +116,6 @@ def standardize(self):
             ]
         )
 
-        standardize_pipe.add_sub_pipeline(self._build_trans_module_sub(clusters=cluster_objects))
-
         logger.info(_("构建TenDBHA集群标准化流程成功"))
         standardize_pipe.run_pipeline(is_drop_random_user=True)
 

diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/spider/spider_cluster_standardize_flow.py b/dbm-ui/backend/flow/engine/bamboo/scene/spider/spider_cluster_standardize_flow.py
@@ -82,7 +82,7 @@ def standardize(self):
             data=self.data,
             need_random_pass_cluster_ids=list(set(self.data["infos"]["cluster_ids"])),
         )
-
+        standardize_pipe.add_sub_pipeline(self._build_trans_module_sub(clusters=cluster_objects))
         standardize_pipe.add_sub_pipeline(self._build_instantiate_config_sub(clusters=cluster_objects))
 
         spider_master_ips = {}
@@ -128,8 +128,6 @@ def standardize(self):
         if spider_mnt_ips:
             standardize_pipe.add_sub_pipeline(self._build_spider_mnt_sub(ips=spider_mnt_ips))
 
-        standardize_pipe.add_sub_pipeline(self._build_trans_module_sub(clusters=cluster_objects))
-
         logger.info(_("构建TenDBCluster集群标准化流程成功"))
         standardize_pipe.run_pipeline(is_drop_random_user=True)
 
@@ -274,7 +272,7 @@ def _build_spider_sub(self, ips: Dict, name: str) -> SubProcess:
         return p.build_sub_process(sub_name=_(name))
 
     def _build_single_instance_sub(
-        self, bk_cloud_id: int, ip: str, mysql_pkg: Package, ports: List[int], version: str
+            self, bk_cloud_id: int, ip: str, mysql_pkg: Package, ports: List[int], version: str
     ) -> SubBuilder:
         single_pipe = SubBuilder(root_id=self.root_id, data=self.data)
 

diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/tendbsingle/standardize.py b/dbm-ui/backend/flow/engine/bamboo/scene/tendbsingle/standardize.py
@@ -66,6 +66,7 @@ def standardize(self):
             need_random_pass_cluster_ids=list(set(self.data["infos"]["cluster_ids"])),
         )
 
+        standardize_pipe.add_sub_pipeline(self._build_trans_module_sub(clusters=cluster_objects))
         standardize_pipe.add_sub_pipeline(self._build_instantiate_mysql_config_sub(clusters=cluster_objects))
 
         storage_ips = {}
@@ -84,7 +85,7 @@ def standardize(self):
                 self._build_storage_sub(ips=storage_ips),
             ]
         )
-        standardize_pipe.add_sub_pipeline(self._build_trans_module_sub(clusters=cluster_objects))
+
         logger.info(_("构建TenDBSingle集群标准化流程成功"))
         standardize_pipe.run_pipeline(is_drop_random_user=True)