fix(backend): mongo亲和性优化调整最终版 TencentBlueKing#14312

Author: huangwentai-wendel

dbm-ui/backend/configuration/constants.py

@@ -77,7 +77,8 @@ class AffinityEnum(StrStructuredEnum):
     NONE = EnumField("NONE", _("无"))
     MAX_EACH_ZONE_EQUAL = EnumField("MAX_EACH_ZONE_EQUAL", _("每个subzone尽量均匀分布"))
     # mongodb专属
-    MAJORITY_ELECTION_DISTRI = EnumField("MAJORITY_ELECTION_DISTRI", _("跨园区(弱)"))
+    CROSS_SUBZONE_STRONG = EnumField("CROSS_SUBZONE_STRONG", _("跨园区(强)"))
+    CROSS_SUBZONE_WEAK = EnumField("CROSS_SUBZONE_WEAK", _("跨园区(弱)"))
 
 
 class DBType(StrStructuredEnum):

dbm-ui/backend/flow/utils/mongodb/calculate_cluster.py

@@ -39,7 +39,10 @@ def machine_order_by_tolerance(disaster_tolerance_level: str, machine_set: list)
 
     machines = []
     # 主从节点分布在不同的机房
-    if disaster_tolerance_level in [AffinityEnum.CROS_SUBZONE, AffinityEnum.MAJORITY_ELECTION_DISTRI]:
+    if disaster_tolerance_level in [
+        AffinityEnum.CROSS_SUBZONE_STRONG,
+        AffinityEnum.CROSS_SUBZONE_WEAK,
+    ]:
         mongo_machine_set = deepcopy(machine_set)
         machines.append(mongo_machine_set[0])
         mongo_machine_set.remove(mongo_machine_set[0])

dbm-ui/backend/ticket/builders/__init__.py

@@ -300,6 +300,7 @@ def patch_info_common_affinity(
         replace_key: str = None,
         tolerance: Union[Callable, float] = None,
         no_need_affinity: bool = False,
+        tolerance_type: str = None,
     ):
         """
         针对批量扩容、替换补充亲和性参数
@@ -308,6 +309,7 @@ def patch_info_common_affinity(
         @param replace_key 替换实例key
         @param tolerance: 亲和性容忍度
         @param no_need_affinity: 是否需要亲和性
+        @param tolerance_type: 亲和性容忍度类型
         """
         # 获得infos中的集群信息
         from backend.ticket.builders.common.base import fetch_cluster_ids
@@ -360,9 +362,7 @@ def __get_exclusive_hosts():
 
         for info in infos:
             cluster = cluster_map[fetch_cluster_ids(info)[0]]
-            cluster_tolerance = (
-                tolerance(cluster, remain_machine_type) if isinstance(tolerance, Callable) else tolerance
-            )
+            cluster_tolerance = tolerance(cluster, tolerance_type) if isinstance(tolerance, Callable) else tolerance
             exclusive_hosts = cluster__remain_hosts_map.get(cluster.id, [])
             self.patch_common_affinity(info, role, cluster, exclusive_hosts, cluster_tolerance, no_need_affinity)
 
@@ -384,7 +384,11 @@ def patch_info_affinity_location(self, roles=None, replace_zone=None):
         for info in self.ticket_data["infos"]:
             cluster = cluster_id_map[fetch_cluster_ids(info)[0]]
             affinity = cluster.disaster_tolerance_level
-            if affinity in [AffinityEnum.CROS_SUBZONE, AffinityEnum.MAJORITY_ELECTION_DISTRI] and machine_zone_map:
+            if (
+                affinity
+                in [AffinityEnum.CROS_SUBZONE, AffinityEnum.CROSS_SUBZONE_STRONG, AffinityEnum.CROSS_SUBZONE_WEAK]
+                and machine_zone_map
+            ):
                 replace_zone = [machine_zone_map[fetch_host_ips(info["old_nodes"])[0]]]
             else:
                 replace_zone = []

dbm-ui/backend/ticket/builders/common/base.py

@@ -23,14 +23,7 @@
 
 from backend.configuration.constants import MASTER_DOMAIN_INITIAL_VALUE, PLAT_BIZ_ID, AffinityEnum
 from backend.constants import DOMAIN_PATTERN
-from backend.db_meta.enums import (
-    AccessLayer,
-    ClusterPhase,
-    ClusterType,
-    InstanceInnerRole,
-    InstanceStatus,
-    MachineType,
-)
+from backend.db_meta.enums import AccessLayer, ClusterPhase, ClusterType, InstanceInnerRole, InstanceStatus
 from backend.db_meta.enums.comm import SystemTagEnum
 from backend.db_meta.models import Cluster, ExtraProcessInstance, Machine, ProxyInstance, Spec, StorageInstance
 from backend.db_services.dbbase.constants import IpDest, IpSource
@@ -146,16 +139,21 @@ def format_bigdata_resource_spec(attrs: Dict[str, Any]) -> Dict[str, Any]:
         resource_spec["location_spec"] = resource_spec.get("location_spec") or cluster_location_spec
 
 
-def get_mongodb_cluster_tolerance(cluster, role=None):
-    if cluster.disaster_tolerance_level == AffinityEnum.CROS_SUBZONE.value:
-        # 跨园区强的情况下， mongos亲和性容忍度是0.5
-        if role == MachineType.MONGOS:
-            tolerance = 0.5
-        else:
-            tolerance = 0.33
+def get_mongodb_cluster_tolerance(disaster_tolerance_level, role=None):
+    tolerance_map = {
+        # 跨园区-强
+        "CROSS_SUBZONE_STRONG": {"mongos": 0.33, "mongodb": 0.33, "mongo_config": 0.33},
+        # 跨园区-弱
+        "CROSS_SUBZONE_WEAK": {"mongos": 0.5, "mongodb": 0.5, "mongo_config": 0.5},
+        # 跨机架
+        "CROSS_RACK": {"mongos": 0.5, "mongodb": 0.33, "mongo_config": 0.33},
+        # 指定园区
+        "SAME_SUBZONE_CROSS_SWTICH": {"mongos": 0.5, "mongodb": 0.33, "mongo_config": 0.33},
+    }
+    if tolerance_map.get(disaster_tolerance_level):
+        return tolerance_map[disaster_tolerance_level][role]
     else:
-        tolerance = 0.5
-    return tolerance
+        return 0.5
 
 
 class HostInfoSerializer(serializers.Serializer):

dbm-ui/backend/ticket/builders/mongodb/mongo_replicaset_add_shard_nodes.py

@@ -58,13 +58,16 @@ def format_ticket_data(self):
 class MongoDBReplicaAddShardNodesResourceParamBuilder(BaseMongoDBOperateResourceParamBuilder):
     def format(self):
         self.patch_info_common_affinity(
-            role="shard_nodes", remain_machine_type=MachineType.MONGODB, tolerance=get_mongodb_cluster_tolerance
+            role="shard_nodes",
+            remain_machine_type=MachineType.MONGODB,
+            tolerance=get_mongodb_cluster_tolerance,
+            tolerance_type="mongodb",
         )
 
     def post_callback(self):
         with self.next_flow_manager() as next_flow:
             for info in next_flow.details["ticket_data"]["infos"]:
-                info["add_shard_nodes"] = [info.pop("shard_nodes")]
+                info["add_shard_nodes"] = info.pop("shard_nodes")
 
 
 @builders.BuilderFactory.register(TicketType.MONGODB_REPLICA_ADD_SHARD_NODES, is_apply=True)

dbm-ui/backend/ticket/builders/mongodb/mongo_replicaset_apply.py

@@ -19,7 +19,11 @@
 from backend.flow.engine.controller.mongodb import MongoDBController
 from backend.iam_app.dataclass.actions import ActionEnum
 from backend.ticket import builders
-from backend.ticket.builders.common.base import TicketBaseValidateSerializerMixin, get_ticket_zone_list
+from backend.ticket.builders.common.base import (
+    TicketBaseValidateSerializerMixin,
+    get_mongodb_cluster_tolerance,
+    get_ticket_zone_list,
+)
 from backend.ticket.builders.mongodb.base import (
     BaseMongoDBOperateResourceParamBuilder,
     BaseMongoReplicaSetTicketFlowBuilder,
@@ -90,10 +94,9 @@ def format_ticket_data(self):
 class MongoReplicaSetResourceParamBuilder(BaseMongoDBOperateResourceParamBuilder):
     def format(self):
         for info in self.ticket_data["infos"]:
-            if info["resource_spec"]["mongo_machine_set"]["affinity"] == AffinityEnum.CROS_SUBZONE.value:
-                info["resource_spec"]["mongo_machine_set"]["tolerance"] = 0.33
-            else:
-                info["resource_spec"]["mongo_machine_set"]["tolerance"] = 0.5
+            info["resource_spec"]["mongo_machine_set"]["tolerance"] = get_mongodb_cluster_tolerance(
+                info["resource_spec"]["mongo_machine_set"]["affinity"], "mongodb"
+            )
 
     def post_callback(self):
         next_flow = self.ticket.next_flow()

dbm-ui/backend/ticket/builders/mongodb/mongo_replicaset_cutoff.py

@@ -44,6 +44,7 @@ def format(self):
             remain_machine_type=MachineType.MONGODB,
             replace_key="mongodb",
             tolerance=get_mongodb_cluster_tolerance,
+            tolerance_type="mongodb",
         )
 
         super().format()

dbm-ui/backend/ticket/builders/mongodb/mongo_replicaset_migrate.py

@@ -58,7 +58,9 @@ def format_ticket_data(self):
 class MongoDBReplicasetMigrateResourceParamBuilder(BaseMongoDBOperateResourceParamBuilder):
     def format(self):
         # 资源申请的一些参数补充
-        self.patch_info_common_affinity(role="mongodb", tolerance=get_mongodb_cluster_tolerance)
+        self.patch_info_common_affinity(
+            role="mongodb", tolerance=get_mongodb_cluster_tolerance, tolerance_type="mongodb"
+        )
 
 
 @builders.BuilderFactory.register(TicketType.MONGODB_REPLICASET_MIGRATE, is_recycle=True)

dbm-ui/backend/ticket/builders/mongodb/mongo_shard_add_shard_nodes.py

@@ -15,13 +15,13 @@
 from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 
-from backend.configuration.constants import AffinityEnum
 from backend.db_meta.enums import MachineType, MachineTypeInstanceRoleMap
 from backend.db_meta.models import AppCache, Cluster
 from backend.db_services.dbbase.constants import IpSource
 from backend.db_services.mongodb.resources.query import MongoDBListRetrieveResource
 from backend.flow.engine.controller.mongodb import MongoDBController
 from backend.ticket import builders
+from backend.ticket.builders.common.base import get_mongodb_cluster_tolerance
 from backend.ticket.builders.mongodb.base import (
     BaseMongoDBOperateDetailSerializer,
     BaseMongoDBOperateResourceParamBuilder,
@@ -77,10 +77,8 @@ def format(self):
         id__cluster = {cluster.id: cluster for cluster in Cluster.objects.filter(id__in=cluster_ids)}
         for info in self.ticket_data["infos"]:
             cluster = id__cluster[info["cluster_id"]]
-            if cluster.disaster_tolerance_level == AffinityEnum.CROS_SUBZONE.value:
-                tolerance = 0.33
-            else:
-                tolerance = 0.5
+            tolerance = get_mongodb_cluster_tolerance(cluster.disaster_tolerance_level, "mongodb")
+
             group_num = info["shards_num"] // info["node_replica_count"]
             old_shard_nodes = info["resource_spec"].pop("shard_nodes")
             old_shard_nodes["count"] = old_shard_nodes["count"] // group_num

dbm-ui/backend/ticket/builders/mongodb/mongo_shard_apply.py

@@ -18,7 +18,11 @@
 from backend.flow.engine.controller.mongodb import MongoDBController
 from backend.iam_app.dataclass.actions import ActionEnum
 from backend.ticket import builders
-from backend.ticket.builders.common.base import TicketBaseValidateSerializerMixin, get_ticket_zone_list
+from backend.ticket.builders.common.base import (
+    TicketBaseValidateSerializerMixin,
+    get_mongodb_cluster_tolerance,
+    get_ticket_zone_list,
+)
 from backend.ticket.builders.mongodb.base import (
     BaseMongoDBOperateResourceParamBuilder,
     BaseMongoShardedTicketFlowBuilder,
@@ -82,14 +86,16 @@ def format_ticket_data(self):
 class MongoShardedClusterResourceParamBuilder(BaseMongoDBOperateResourceParamBuilder):
     def format(self):
         """格式化mongodb申请的组数"""
-        if self.ticket_data["disaster_tolerance_level"] == AffinityEnum.CROS_SUBZONE.value:
-            self.ticket_data["resource_spec"]["mongodb"]["tolerance"] = 0.33
-            self.ticket_data["resource_spec"]["mongo_config"]["tolerance"] = 0.33
-            self.ticket_data["resource_spec"]["mongos"]["tolerance"] = 0.5
-        else:
-            self.ticket_data["resource_spec"]["mongodb"]["tolerance"] = 0.5
-            self.ticket_data["resource_spec"]["mongo_config"]["tolerance"] = 0.5
-            self.ticket_data["resource_spec"]["mongos"]["tolerance"] = 0.5
+        self.ticket_data["resource_spec"]["mongodb"] = get_mongodb_cluster_tolerance(
+            self.ticket_data["disaster_tolerance_level"], "mongodb"
+        )
+        self.ticket_data["resource_spec"]["mongo_config"] = get_mongodb_cluster_tolerance(
+            self.ticket_data["disaster_tolerance_level"], "mongo_config"
+        )
+        self.ticket_data["resource_spec"]["mongos"] = get_mongodb_cluster_tolerance(
+            self.ticket_data["disaster_tolerance_level"], "mongos"
+        )
+
         resource_spec = self.ticket_data["resource_spec"]
         self.format_mongo_resource_spec(resource_spec, self.ticket_data["shard_machine_group"])