fix(mysql): 修复只读集群部署的flow出现构建失败的问题 #10202

Author: yksitu

dbm-ui/backend/flow/engine/bamboo/scene/spider/common/common_sub_flow.py

@@ -30,6 +30,7 @@
 from backend.flow.plugins.components.collections.common.download_backup_client import DownloadBackupClientComponent
 from backend.flow.plugins.components.collections.mysql.clear_machine import MySQLClearMachineComponent
 from backend.flow.plugins.components.collections.mysql.clone_user import CloneUserComponent
+from backend.flow.plugins.components.collections.mysql.dns_manage import MySQLDnsManageComponent
 from backend.flow.plugins.components.collections.mysql.exec_actuator_script import ExecuteDBActuatorScriptComponent
 from backend.flow.plugins.components.collections.mysql.sync_master import SyncMasterComponent
 from backend.flow.plugins.components.collections.mysql.trans_flies import TransFileComponent
@@ -41,6 +42,7 @@
 from backend.flow.utils.base.base_dataclass import Instance
 from backend.flow.utils.common_act_dataclass import DownloadBackupClientKwargs
 from backend.flow.utils.mysql.mysql_act_dataclass import (
+    CreateDnsKwargs,
     DBMetaOPKwargs,
     DelServiceInstKwargs,
     DownloadMediaKwargs,
@@ -65,17 +67,17 @@
 def add_spider_slaves_sub_flow(
     uid: str,
     cluster: Cluster,
-    slave_domain: str,
     add_spider_slaves: list,
     root_id: str,
     parent_global_data: dict,
     is_clone_user: bool = True,
+    slave_domain: str = None,
 ):
     """
     定义对原有的TenDB cluster集群添加spider slave节点的公共子流程
     提供部分需要单据使用：比如添加从集群、扩容接入层等功能
     @param cluster: 待操作的集群
-    @param slave_domain: 带添加spider slave节点所要关联的域名
+    @param slave_domain: 带添加spider slave节点所要关联的域名, 这里参数只针对只读集群的部署
     @param add_spider_slaves: 待添加的slave机器列表信息
     @param root_id: flow流程的root_id
     @param parent_global_data: 本次子流程的对应上层流程的全局只读上下文
@@ -219,30 +221,35 @@ def add_spider_slaves_sub_flow(
     )
 
     # 阶段7 添加从域名
-    # sub_pipeline.add_act(
-    #     act_name=_("添加集群域名"),
-    #     act_component_code=MySQLDnsManageComponent.code,
-    #     kwargs=asdict(
-    #         CreateDnsKwargs(
-    #             bk_cloud_id=cluster.bk_cloud_id,
-    #             add_domain_name=slave_domain,
-    #             dns_op_exec_port=tmp_spider.port,
-    #             exec_ip=[ip_info["ip"] for ip_info in add_spider_slaves],
-    #         )
-    #     ),
-    # )
-    entrysub_process = BuildEntrysManageSubflow(
-        root_id=root_id,
-        ticket_data=parent_global_data,
-        op_type=DnsOpType.CREATE,
-        param={
-            "cluster_id": cluster.id,
-            "port": tmp_spider.port,
-            "add_ips": [ip_info["ip"] for ip_info in add_spider_slaves],
-            "entry_role": [ClusterEntryRole.SLAVE_ENTRY.value],
-        },
-    )
-    sub_pipeline.add_sub_pipeline(sub_flow=entrysub_process)
+    if slave_domain:
+        # 这里针对spider_slave集群部署的场景，从域名是传进来的
+        sub_pipeline.add_act(
+            act_name=_("添加集群域名"),
+            act_component_code=MySQLDnsManageComponent.code,
+            kwargs=asdict(
+                CreateDnsKwargs(
+                    bk_cloud_id=cluster.bk_cloud_id,
+                    add_domain_name=slave_domain,
+                    dns_op_exec_port=tmp_spider.port,
+                    exec_ip=[ip_info["ip"] for ip_info in add_spider_slaves],
+                )
+            ),
+        )
+    else:
+        # 这里是针对扩容spider slave场景，所有的访问映射关系通过元数据获取
+        entry_sub_process = BuildEntrysManageSubflow(
+            root_id=root_id,
+            ticket_data=parent_global_data,
+            op_type=DnsOpType.CREATE,
+            param={
+                "cluster_id": cluster.id,
+                "port": tmp_spider.port,
+                "add_ips": [ip_info["ip"] for ip_info in add_spider_slaves],
+                "entry_role": [ClusterEntryRole.SLAVE_ENTRY.value],
+            },
+        )
+        sub_pipeline.add_sub_pipeline(sub_flow=entry_sub_process)
+
     return sub_pipeline.build_sub_process(sub_name=_("集群[{}]添加spider slave节点".format(cluster.name)))
 
 

dbm-ui/backend/flow/engine/bamboo/scene/spider/spider_add_nodes.py

@@ -15,9 +15,9 @@
 
 from django.utils.translation import ugettext as _
 
-from backend.db_meta.enums import ClusterEntryRole, TenDBClusterSpiderRole
+from backend.db_meta.enums import TenDBClusterSpiderRole
 from backend.db_meta.exceptions import ClusterNotExistException
-from backend.db_meta.models import Cluster, ClusterEntry
+from backend.db_meta.models import Cluster
 from backend.flow.engine.bamboo.scene.common.builder import Builder, SubBuilder
 from backend.flow.engine.bamboo.scene.spider.common.common_sub_flow import (
     add_spider_masters_sub_flow,
@@ -89,15 +89,8 @@ def add_spider_nodes(self):
 
             elif info["add_spider_role"] == TenDBClusterSpiderRole.SPIDER_SLAVE:
 
-                try:
-                    # 先判断集群是否存在已添加从集群，如果没有则跳过这次扩容，判断依据是集群是存在有且只有一个的从域名
-                    slave_dns = cluster.clusterentry_set.get(role=ClusterEntryRole.SLAVE_ENTRY)
-                    # 加入spider-slave 子流程
-                    sub_pipelines.append(self.add_spider_slave_notes(sub_flow_context, cluster, slave_dns.entry))
-
-                except ClusterEntry.DoesNotExist:
-                    logger.warning(_("[{}]The cluster has not added a slave cluster, skip".format(cluster.name)))
-                    continue
+                # 加入spider-slave 子流程
+                sub_pipelines.append(self.add_spider_slave_notes(sub_flow_context, cluster))
 
             else:
                 # 理论上不会出现，出现就中断这次流程构造
@@ -151,7 +144,7 @@ def add_spider_master_notes(self, sub_flow_context: dict, cluster: Cluster):
         )
         return sub_pipeline.build_sub_process(sub_name=_("[{}]添加spider-master节点流程".format(cluster.name)))
 
-    def add_spider_slave_notes(self, sub_flow_context: dict, cluster: Cluster, slave_dns: str):
+    def add_spider_slave_notes(self, sub_flow_context: dict, cluster: Cluster):
         """
         添加spider-slave节点的子流程流程逻辑
         必须集群存在从集群，才能添加
@@ -169,7 +162,6 @@ def add_spider_slave_notes(self, sub_flow_context: dict, cluster: Cluster, slave
                 root_id=self.root_id,
                 uid=sub_flow_context["uid"],
                 parent_global_data=copy.deepcopy(sub_flow_context),
-                slave_domain=slave_dns,
             )
         )
         # 阶段2 变更db_meta数据