fix(mysql): mysql增加记录集群的指定机房特性 #9937

yksitu · yksitu · commit fa46cbad52c7 · 2025-04-11T15:08:30.000+08:00
diff --git a/dbm-ui/backend/db_meta/api/cluster/sqlserverha/create_cluster.py b/dbm-ui/backend/db_meta/api/cluster/sqlserverha/create_cluster.py
@@ -77,6 +77,7 @@ def create(
     slave_domain: Optional[str] = None,
     storages: Optional[List] = None,
     creator: str = "",
+    zone_list: list = None,
 ) -> Cluster:
     """
     注册 sqlserver-HA 集群
@@ -113,6 +114,7 @@ def create(
         major_version=major_version,
         region=region,
         disaster_tolerance_level=disaster_tolerance_level,
+        zone_list=zone_list if zone_list else [],
     )
     cluster.storageinstance_set.add(*storage_objs)
 
diff --git a/dbm-ui/backend/db_meta/api/cluster/sqlserverha/handler.py b/dbm-ui/backend/db_meta/api/cluster/sqlserverha/handler.py
@@ -49,6 +49,7 @@ def create(
         region: str,
         sync_type: str,
         disaster_tolerance_level: str,
+        zone_list: list,
         is_increment: bool = False,
     ):
         """
@@ -118,6 +119,7 @@ def create(
                     region=region,
                     sync_type=sync_type,
                     disaster_tolerance_level=disaster_tolerance_level,
+                    zone_list=zone_list,
                 )
             )
 
diff --git a/dbm-ui/backend/db_meta/api/cluster/sqlserversingle/create_cluster.py b/dbm-ui/backend/db_meta/api/cluster/sqlserversingle/create_cluster.py
@@ -51,6 +51,7 @@ def create(
     bk_cloud_id: int,
     region: str,
     creator: str = "",
+    zone_list: list = None,
 ) -> Cluster:
     bk_biz_id = request_validator.validated_integer(bk_biz_id)
     immute_domain = request_validator.validated_domain(immute_domain)
@@ -76,6 +77,7 @@ def create(
         time_zone=get_instance_time_zone(storage_objs[0]),
         major_version=major_version,
         region=region,
+        zone_list=zone_list if zone_list else [],
     )
     cluster.storageinstance_set.add(*storage_objs)
 
diff --git a/dbm-ui/backend/db_meta/api/cluster/sqlserversingle/handler.py b/dbm-ui/backend/db_meta/api/cluster/sqlserversingle/handler.py
@@ -34,6 +34,7 @@ def create(
         bk_cloud_id: int,
         resource_spec: dict,
         region: str,
+        zone_list: list,
         is_increment: bool = False,
     ):
         """
@@ -87,6 +88,7 @@ def create(
                     creator=creator,
                     bk_cloud_id=bk_cloud_id,
                     region=region,
+                    zone_list=zone_list,
                 )
             )
 
diff --git a/dbm-ui/backend/db_meta/api/cluster/tendbcluster/create_cluster.py b/dbm-ui/backend/db_meta/api/cluster/tendbcluster/create_cluster.py
@@ -88,6 +88,7 @@ def create(
     disaster_tolerance_level: str = AffinityEnum.NONE.value,
     creator: str = "",
     region: str = "",
+    zone_list: Optional[List] = None,
 ) -> Cluster:
     """
     注册 TenDBCluster 集群
@@ -123,6 +124,7 @@ def create(
         major_version=major_version,  # 这里存储集群的主版本信息，主要是为展示，存储mysql版本
         region=region,  # 这里保存申请资源的地域信息
         disaster_tolerance_level=disaster_tolerance_level,
+        zone_list=zone_list if zone_list else [],
     )
 
     # 添加 cluster 与所有spider实例和storage实例的映射关系
diff --git a/dbm-ui/backend/db_meta/api/cluster/tendbcluster/handler.py b/dbm-ui/backend/db_meta/api/cluster/tendbcluster/handler.py
@@ -62,6 +62,7 @@ def create(
         resource_spec: dict,
         region: str,
         disaster_tolerance_level: str,
+        zone_list: list,
     ):
         """「必须」创建spider集群"""
 
@@ -148,6 +149,7 @@ def create(
             creator=creator,
             region=region,
             disaster_tolerance_level=disaster_tolerance_level,
+            zone_list=zone_list,
         )
 
         cc_topo_operator = MysqlCCTopoOperator(cluster)
diff --git a/dbm-ui/backend/db_meta/api/cluster/tendbha/create_cluster.py b/dbm-ui/backend/db_meta/api/cluster/tendbha/create_cluster.py
@@ -78,6 +78,7 @@ def create(
     proxies: Optional[List] = None,
     storages: Optional[List] = None,
     creator: str = "",
+    zone_list: Optional[List] = None,
 ) -> Cluster:
     """
     注册 TenDBHA 集群
@@ -112,6 +113,7 @@ def create(
         major_version=major_version,
         region=region,
         disaster_tolerance_level=disaster_tolerance_level,
+        zone_list=zone_list if zone_list else [],
     )
     cluster.proxyinstance_set.add(*proxy_objs)
     cluster.storageinstance_set.add(*storage_objs)
diff --git a/dbm-ui/backend/db_meta/api/cluster/tendbha/handler.py b/dbm-ui/backend/db_meta/api/cluster/tendbha/handler.py
@@ -50,6 +50,7 @@ def create(
         resource_spec: dict,
         region: str,
         disaster_tolerance_level: str,
+        zone_list: list,
     ):
         """「必须」创建集群,多实例录入方式"""
 
@@ -145,6 +146,7 @@ def create(
                     major_version=major_version,
                     region=region,
                     disaster_tolerance_level=disaster_tolerance_level,
+                    zone_list=zone_list,
                 )
             )
 
diff --git a/dbm-ui/backend/db_meta/api/cluster/tendbsingle/create_cluster.py b/dbm-ui/backend/db_meta/api/cluster/tendbsingle/create_cluster.py
@@ -51,6 +51,7 @@ def create(
     time_zone: str,
     region: str,
     creator: str = "",
+    zone_list: list = None,
 ) -> Cluster:
     bk_biz_id = request_validator.validated_integer(bk_biz_id)
     immute_domain = request_validator.validated_domain(immute_domain)
@@ -72,6 +73,7 @@ def create(
         time_zone=time_zone,
         major_version=major_version,
         region=region,
+        zone_list=zone_list if zone_list else [],
     )
     cluster.storageinstance_set.add(*storage_objs)
 
diff --git a/dbm-ui/backend/db_meta/api/cluster/tendbsingle/handler.py b/dbm-ui/backend/db_meta/api/cluster/tendbsingle/handler.py
@@ -40,6 +40,7 @@ def create(
         bk_cloud_id: int,
         resource_spec: dict,
         region: str,
+        zone_list: list,
     ):
         """「必须」创建集群"""
         api.machine.create(
@@ -92,6 +93,7 @@ def create(
                     bk_cloud_id=bk_cloud_id,
                     time_zone=time_zone,
                     region=region,
+                    zone_list=zone_list,
                 )
             )
 
diff --git a/dbm-ui/backend/db_meta/models/cluster.py b/dbm-ui/backend/db_meta/models/cluster.py
@@ -71,6 +71,7 @@ class Cluster(AuditedModel):
     )
     time_zone = models.CharField(max_length=16, default=DEFAULT_TIME_ZONE, help_text=_("集群所在的时区"))
     tags = models.ManyToManyField(Tag, blank=True, help_text=_("标签（外键）"))
+    zone_list = models.JSONField(default=list, help_text=_("指定机房列表，空列表代表随机"))
 
     class Meta:
         unique_together = [("bk_biz_id", "immute_domain", "cluster_type", "db_module_id"), ("immute_domain",)]
diff --git a/dbm-ui/backend/flow/utils/mysql/mysql_db_meta.py b/dbm-ui/backend/flow/utils/mysql/mysql_db_meta.py
@@ -72,6 +72,7 @@ def mysql_single_apply(self) -> bool:
             bk_cloud_id=int(self.ticket_data["bk_cloud_id"]),
             resource_spec=self.ticket_data.get("resource_spec", def_resource_spec),
             region=self.ticket_data["city"],
+            zone_list=self.ticket_data.get("zone_list", []),
         )
         return True
 
@@ -97,6 +98,7 @@ def mysql_ha_apply(self) -> bool:
             "resource_spec": self.ticket_data.get("resource_spec", def_resource_spec),
             "region": self.ticket_data["city"],
             "disaster_tolerance_level": self.ticket_data["disaster_tolerance_level"],
+            "zone_list": self.ticket_data.get("zone_list", []),
         }
         TenDBHAClusterHandler.create(**kwargs)
         return True
diff --git a/dbm-ui/backend/flow/utils/spider/spider_db_meta.py b/dbm-ui/backend/flow/utils/spider/spider_db_meta.py
@@ -68,6 +68,7 @@ def tendb_cluster_apply(self):
             "shard_infos": shard_infos,
             "region": self.global_data["city"],
             "disaster_tolerance_level": self.global_data["disaster_tolerance_level"],
+            "zone_list": self.global_data.get("zone_list", []),
         }
         TenDBClusterClusterHandler.create(**kwargs)
         return True
diff --git a/dbm-ui/backend/flow/utils/sqlserver/sqlserver_db_meta.py b/dbm-ui/backend/flow/utils/sqlserver/sqlserver_db_meta.py
@@ -51,6 +51,7 @@ def sqlserver_single_apply(self):
             resource_spec=self.global_data.get("resource_spec", def_resource_spec),
             region=self.global_data["region"],
             is_increment=self.global_data.get("is_increment", False),
+            zone_list=self.global_data.get("zone_list", []),
         )
         return True
 
@@ -74,6 +75,7 @@ def sqlserver_ha_apply(self):
             sync_type=self.global_data["sync_type"],
             disaster_tolerance_level=self.global_data["disaster_tolerance_level"],
             is_increment=self.global_data.get("is_increment", False),
+            zone_list=self.global_data.get("zone_list", []),
         )
         return True
 

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ def create(`
`49`	`49`	`region: str,`
`50`	`50`	`sync_type: str,`
`51`	`51`	`disaster_tolerance_level: str,`
	`52`	`+ zone_list: list,`
`52`	`53`	`is_increment: bool = False,`
`53`	`54`	`):`
`54`	`55`	`"""`
`@@ -118,6 +119,7 @@ def create(`
`118`	`119`	`region=region,`
`119`	`120`	`sync_type=sync_type,`
`120`	`121`	`disaster_tolerance_level=disaster_tolerance_level,`
	`122`	`+ zone_list=zone_list,`
`121`	`123`	`)`
`122`	`124`	`)`
`123`	`125`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ def create(`
`34`	`34`	`bk_cloud_id: int,`
`35`	`35`	`resource_spec: dict,`
`36`	`36`	`region: str,`
	`37`	`+ zone_list: list,`
`37`	`38`	`is_increment: bool = False,`
`38`	`39`	`):`
`39`	`40`	`"""`
`@@ -87,6 +88,7 @@ def create(`
`87`	`88`	`creator=creator,`
`88`	`89`	`bk_cloud_id=bk_cloud_id,`
`89`	`90`	`region=region,`
	`91`	`+ zone_list=zone_list,`
`90`	`92`	`)`
`91`	`93`	`)`
`92`	`94`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ def create(`
`50`	`50`	`resource_spec: dict,`
`51`	`51`	`region: str,`
`52`	`52`	`disaster_tolerance_level: str,`
	`53`	`+ zone_list: list,`
`53`	`54`	`):`
`54`	`55`	`"""「必须」创建集群,多实例录入方式"""`
`55`	`56`
`@@ -145,6 +146,7 @@ def create(`
`145`	`146`	`major_version=major_version,`
`146`	`147`	`region=region,`
`147`	`148`	`disaster_tolerance_level=disaster_tolerance_level,`
	`149`	`+ zone_list=zone_list,`
`148`	`150`	`)`
`149`	`151`	`)`
`150`	`152`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ def create(`
`40`	`40`	`bk_cloud_id: int,`
`41`	`41`	`resource_spec: dict,`
`42`	`42`	`region: str,`
	`43`	`+ zone_list: list,`
`43`	`44`	`):`
`44`	`45`	`"""「必须」创建集群"""`
`45`	`46`	`api.machine.create(`
`@@ -92,6 +93,7 @@ def create(`
`92`	`93`	`bk_cloud_id=bk_cloud_id,`
`93`	`94`	`time_zone=time_zone,`
`94`	`95`	`region=region,`
	`96`	`+ zone_list=zone_list,`
`95`	`97`	`)`
`96`	`98`	`)`
`97`	`99`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ class Cluster(AuditedModel):`
`71`	`71`	`)`
`72`	`72`	`time_zone = models.CharField(max_length=16, default=DEFAULT_TIME_ZONE, help_text=_("集群所在的时区"))`
`73`	`73`	`tags = models.ManyToManyField(Tag, blank=True, help_text=_("标签（外键）"))`
	`74`	`+ zone_list = models.JSONField(default=list, help_text=_("指定机房列表，空列表代表随机"))`
`74`	`75`
`75`	`76`	`class Meta:`
`76`	`77`	`unique_together = [("bk_biz_id", "immute_domain", "cluster_type", "db_module_id"), ("immute_domain",)]`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ def mysql_single_apply(self) -> bool:`
`72`	`72`	`bk_cloud_id=int(self.ticket_data["bk_cloud_id"]),`
`73`	`73`	`resource_spec=self.ticket_data.get("resource_spec", def_resource_spec),`
`74`	`74`	`region=self.ticket_data["city"],`
	`75`	`+ zone_list=self.ticket_data.get("zone_list", []),`
`75`	`76`	`)`
`76`	`77`	`return True`
`77`	`78`
`@@ -97,6 +98,7 @@ def mysql_ha_apply(self) -> bool:`
`97`	`98`	`"resource_spec": self.ticket_data.get("resource_spec", def_resource_spec),`
`98`	`99`	`"region": self.ticket_data["city"],`
`99`	`100`	`"disaster_tolerance_level": self.ticket_data["disaster_tolerance_level"],`
	`101`	`+ "zone_list": self.ticket_data.get("zone_list", []),`
`100`	`102`	`}`
`101`	`103`	`TenDBHAClusterHandler.create(**kwargs)`
`102`	`104`	`return True`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ def tendb_cluster_apply(self):`
`68`	`68`	`"shard_infos": shard_infos,`
`69`	`69`	`"region": self.global_data["city"],`
`70`	`70`	`"disaster_tolerance_level": self.global_data["disaster_tolerance_level"],`
	`71`	`+ "zone_list": self.global_data.get("zone_list", []),`
`71`	`72`	`}`
`72`	`73`	`TenDBClusterClusterHandler.create(**kwargs)`
`73`	`74`	`return True`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ def sqlserver_single_apply(self):`
`51`	`51`	`resource_spec=self.global_data.get("resource_spec", def_resource_spec),`
`52`	`52`	`region=self.global_data["region"],`
`53`	`53`	`is_increment=self.global_data.get("is_increment", False),`
	`54`	`+ zone_list=self.global_data.get("zone_list", []),`
`54`	`55`	`)`
`55`	`56`	`return True`
`56`	`57`
`@@ -74,6 +75,7 @@ def sqlserver_ha_apply(self):`
`74`	`75`	`sync_type=self.global_data["sync_type"],`
`75`	`76`	`disaster_tolerance_level=self.global_data["disaster_tolerance_level"],`
`76`	`77`	`is_increment=self.global_data.get("is_increment", False),`
	`78`	`+ zone_list=self.global_data.get("zone_list", []),`
`77`	`79`	`)`
`78`	`80`	`return True`
`79`	`81`