fix(backend): redis集群列表展示优化 #8416

Author: ygcyao

dbm-ui/backend/db_services/dbbase/serializers.py

@@ -17,6 +17,7 @@
 from backend.configuration.constants import DBType
 from backend.db_dirty.models import DirtyMachine
 from backend.db_meta.enums import ClusterPhase, ClusterType
+from backend.db_meta.models import Cluster
 from backend.db_services.dbbase.constants import ResourceType
 from backend.db_services.dbbase.resources.serializers import ListClusterEntriesSLZ, ListResourceSLZ
 from backend.db_services.ipchooser.query.resource import ResourceQueryHelper
@@ -211,3 +212,25 @@ class QueryClusterCapSerializer(serializers.Serializer):
 class QueryClusterCapResponseSerializer(serializers.Serializer):
     class Meta:
         swagger_schema_fields = {"example": {"cluster1": {"used": 1, "total": 2, "in_use": 50}}}
+
+
+class UpdateClusterAliasSerializer(serializers.Serializer):
+    bk_biz_id = serializers.IntegerField(help_text=_("业务ID"))
+    cluster_id = serializers.IntegerField(help_text=_("集群ID"))
+    new_alias = serializers.CharField(help_text=_("新集群别名"))
+
+    def validate(self, attrs):
+        bk_biz_id = attrs.get("bk_biz_id")
+        cluster_id = attrs.get("cluster_id")
+        new_alias = attrs.get("new_alias")
+
+        try:
+            cluster = Cluster.objects.get(bk_biz_id=bk_biz_id, id=cluster_id)
+        except Cluster.DoesNotExist:
+            raise serializers.ValidationError(_("Cluster with the given ID does not exist."))
+
+        # 验证新别名不能与原集群名相同
+        if cluster.alias == new_alias:
+            raise serializers.ValidationError(_("The new alias cannot be the same as the current alias."))
+
+        return attrs

dbm-ui/backend/db_services/dbbase/views.py

@@ -29,6 +29,7 @@
 from backend.db_services.dbbase.instances.yasg_slz import CheckInstancesResSLZ, CheckInstancesSLZ
 from backend.db_services.dbbase.resources import register
 from backend.db_services.dbbase.resources.query import ListRetrieveResource, ResourceList
+from backend.db_services.dbbase.resources.serializers import ClusterSLZ
 from backend.db_services.dbbase.serializers import (
     ClusterDbTypeSerializer,
     ClusterEntryFilterSerializer,
@@ -45,6 +46,7 @@
     QueryClusterCapSerializer,
     QueryClusterInstanceCountSerializer,
     ResourceAdministrationSerializer,
+    UpdateClusterAliasSerializer,
     WebConsoleResponseSerializer,
     WebConsoleSerializer,
 )
@@ -407,3 +409,18 @@ def query_cluster_stat(self, request, *args, **kwargs):
         cluster_stat_map = {cluster_domain_map[domain]: cap for domain, cap in cluster_stat_map.items()}
 
         return Response(cluster_stat_map)
+
+    @common_swagger_auto_schema(
+        operation_summary=_("更新集群别名"),
+        request_body=UpdateClusterAliasSerializer(),
+        tags=[SWAGGER_TAG],
+    )
+    @action(methods=["POST"], detail=False, serializer_class=UpdateClusterAliasSerializer)
+    def update_cluster_alias(self, request):
+        validated_data = self.params_validate(self.get_serializer_class())
+        """更新集群别名"""
+        cluster = Cluster.objects.get(bk_biz_id=validated_data["bk_biz_id"], id=validated_data["cluster_id"])
+        cluster.alias = validated_data["new_alias"]
+        cluster.save(update_fields=["alias"])
+        serializer = ClusterSLZ(cluster)
+        return Response(serializer.data)

dbm-ui/backend/db_services/redis/resources/redis_cluster/query.py

@@ -105,6 +105,10 @@ def _filter_cluster_hook(
         offset: int,
         **kwargs,
     ) -> ResourceList:
+        # 提前预取storage的tuple
+        storage_queryset = storage_queryset.prefetch_related(
+            "machine", "nosqlstoragesetdtl_set", "as_receiver", "as_ejector"
+        )
         # 预取remote的spec
         redis_spec_map = {spec.spec_id: spec for spec in Spec.objects.filter(spec_cluster_type=SpecClusterType.Redis)}
         return super()._filter_cluster_hook(
@@ -132,9 +136,44 @@ def _to_cluster_representation(
         **kwargs,
     ) -> Dict[str, Any]:
         """集群序列化"""
-        redis_master = [m.simple_desc for m in cluster.storages if m.instance_role == InstanceRole.REDIS_MASTER]
-        redis_slave = [m.simple_desc for m in cluster.storages if m.instance_role == InstanceRole.REDIS_SLAVE]
-        machine_list = list(set([inst["bk_host_id"] for inst in [*redis_master, *redis_slave]]))
+        # 创建一个字典来存储 ejector_id 到cluster.storages下标的映射
+        ejector_id__storage_map = {storage_instance.id: storage_instance for storage_instance in cluster.storages}
+
+        remote_infos = {InstanceRole.REDIS_MASTER.value: [], InstanceRole.REDIS_SLAVE.value: []}
+        for inst in cluster.storages:
+            try:
+                seg_range = (
+                    inst.nosqlstoragesetdtl_set.all()[0].seg_range
+                    if inst.cluster_type != ClusterType.RedisInstance.value
+                    else "-1"
+                )
+            except IndexError:
+                # 异常处理 因nosqlstoragesetdtl的分片数据只有redis为master才有seg_range值 以下处理是slave找出对应master seg_range并赋予值 供主从对应排序处理
+                master = ejector_id__storage_map.get(inst.as_receiver.all()[0].ejector_id)
+                seg_range = master.nosqlstoragesetdtl_set.all()[0].seg_range if master is not None else "-1"
+            except Exception:
+                # 如果无法找到seg_range，则默认为-1。有可能实例处于restoring状态(比如集群容量变更时)
+                seg_range = "-1"
+
+            remote_infos[inst.instance_role].append({**inst.simple_desc, "seg_range": seg_range})
+
+        remote_infos[InstanceRole.REDIS_MASTER.value].sort(
+            key=lambda x: int(x.get("seg_range", "-1").split("-")[0]) if x.get("seg_range", "-1").split("-")[0] else -1
+        )
+        remote_infos[InstanceRole.REDIS_SLAVE.value].sort(
+            key=lambda x: int(x.get("seg_range", "-1").split("-")[0]) if x.get("seg_range", "-1").split("-")[0] else -1
+        )
+        machine_list = list(
+            set(
+                [
+                    inst["bk_host_id"]
+                    for inst in [
+                        *remote_infos[InstanceRole.REDIS_MASTER.value],
+                        *remote_infos[InstanceRole.REDIS_SLAVE.value],
+                    ]
+                ]
+            )
+        )
         machine_pair_cnt = len(machine_list) / 2
 
         # 补充集群的规格和容量信息
@@ -163,9 +202,9 @@ def _to_cluster_representation(
             "cluster_capacity": cluster_capacity,
             "dns_to_clb": dns_to_clb,
             "proxy": [m.simple_desc for m in cluster.proxies],
-            "redis_master": redis_master,
-            "redis_slave": redis_slave,
-            "cluster_shard_num": len(redis_master),
+            "redis_master": remote_infos[InstanceRole.REDIS_MASTER.value],
+            "redis_slave": remote_infos[InstanceRole.REDIS_SLAVE.value],
+            "cluster_shard_num": len(remote_infos[InstanceRole.REDIS_MASTER.value]),
             "machine_pair_cnt": machine_pair_cnt,
             "module_names": module_names,
         }