fix(backend): tendbcluster集群拓扑按shard_id排序展示 TencentBlueKing#9196

# Reviewed, transaction id: 29823

dbm-ui/backend/db_meta/api/cluster/tendbcluster/detail.py

@@ -8,11 +8,12 @@
 an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
 """
+from collections import defaultdict
 
 from django.utils.translation import gettext as _
 
 from backend.db_meta.api.cluster.base.graph import Graphic, Group, LineLabel, Node
-from backend.db_meta.enums import InstanceRole, TenDBClusterSpiderRole
+from backend.db_meta.enums import InstanceInnerRole, TenDBClusterSpiderRole
 from backend.db_meta.models import Cluster
 
 
@@ -21,6 +22,23 @@ def scan_cluster(cluster: Cluster) -> Graphic:
     绘制spider的拓扑结构图
     """
 
+    def get_remote_infos(insts):
+        """获取remote信息，并补充分片信息"""
+        remote_infos = defaultdict(list)
+        for inst in insts:
+            try:
+                related = "as_ejector" if inst.instance_inner_role == InstanceInnerRole.MASTER else "as_receiver"
+                shard_id = getattr(inst, related).all()[0].tendbclusterstorageset.shard_id
+            except Exception:
+                # 如果无法找到shard_id，则默认为-1。有可能实例处于restoring状态(比如集群容量变更时)
+                shard_id = -1
+            setattr(inst, "shard_id", shard_id)
+            remote_infos[inst.instance_role].append(inst)
+
+        remote_infos["remote_master"] = sorted(remote_infos["remote_master"], key=lambda x: getattr(x, "shard_id", -1))
+        remote_infos["remote_slave"] = sorted(remote_infos["remote_slave"], key=lambda x: getattr(x, "shard_id", -1))
+        return remote_infos["remote_master"], remote_infos["remote_slave"]
+
     def build_spider_entry_relations(role, spider_group_name, entry_group_id, entry_group_name):
         """获得Spider和对应的访问入口，并建立访问关系"""
 
@@ -36,16 +54,29 @@ def build_spider_entry_relations(role, spider_group_name, entry_group_id, entry_
 
         return spider_insts, spider_group
 
-    def build_spider_remote_relations(role, spider_group, remote_group_name):
+    def _get_or_create_group(instances, group_name):
+        """辅助函数：创建或获取组"""
+        if not instances:
+            raise ValueError(f"No instances provided for group {group_name}.")
+        return graph.get_or_create_group(group_id=Node.generate_node_type(instances[0]), group_name=group_name)
+
+    def _add_nodes_to_group(instances, group):
+        """辅助函数：将实例添加到组中"""
+        for inst in instances:
+            graph.add_node(inst, group)
+
+    def add_remote_nodes(cluster):
         """获取remote节点，并跟相应的spider建立关系"""
+        remote_db, remote_dr = get_remote_infos(cluster.storages)
+        # 创建或获取 RemoteDB 和 RemoteDR 组
+        db_group = _get_or_create_group(remote_db, "RemoteDB")
+        dr_group = _get_or_create_group(remote_dr, "RemoteDR")
 
-        remote_insts, remote_group = graph.add_instance_nodes(
-            cluster=cluster, roles=role, group_name=remote_group_name
-        )
-        if spider_group:
-            graph.add_line(source=spider_group, target=remote_group, label=LineLabel.Access)
+        # 将实例添加到相应的组中
+        _add_nodes_to_group(remote_db, db_group)
+        _add_nodes_to_group(remote_dr, dr_group)
 
-        return remote_insts, remote_group
+        return db_group, dr_group
 
     graph = Graphic(node_id=Graphic.generate_graphic_id(cluster))
 
@@ -68,14 +99,16 @@ def build_spider_remote_relations(role, spider_group, remote_group_name):
     if spider_master_group and spider_slave_group:
         graph.add_line(source=spider_master_group, target=spider_slave_group, label=LineLabel.Access)
 
-    # 建立spider master与remote db的关系
-    __, remote_db_group = build_spider_remote_relations(
-        InstanceRole.REMOTE_MASTER, spider_group=spider_master_group, remote_group_name=_("RemoteDB")
-    )
-    # 建立spider slave与remote dr的关系
-    __, remote_dr_group = build_spider_remote_relations(
-        InstanceRole.REMOTE_SLAVE, spider_group=spider_slave_group, remote_group_name=_("RemoteDR")
-    )
+    # 按master/slave组分片数排序
+    remote_db_group, remote_dr_group = add_remote_nodes(cluster)
+
+    # 建立spider_master和remote db的关系
+    if spider_master_group:
+        graph.add_line(source=spider_master_group, target=remote_db_group, label=LineLabel.Access)
+
+    # 建立spider_master和remote dr的关系
+    if spider_slave_group:
+        graph.add_line(source=spider_master_group, target=remote_dr_group, label=LineLabel.Access)
 
     # 建立remote dr与remote db的数据同步关系
     graph.add_line(source=remote_db_group, target=remote_dr_group, label=LineLabel.Rep)

dbm-ui/backend/db_services/mysql/resources/tendbcluster/query.py

@@ -11,7 +11,7 @@
 from collections import defaultdict
 from typing import Any, Callable, Dict, List
 
-from django.db.models import F, Q, QuerySet, Value
+from django.db.models import F, Prefetch, Q, QuerySet, Value
 from django.forms import model_to_dict
 from django.utils.translation import ugettext_lazy as _
 
@@ -271,7 +271,12 @@ def _list_machines(
 
     @classmethod
     def get_topo_graph(cls, bk_biz_id: int, cluster_id: int) -> dict:
-        cluster = Cluster.objects.get(bk_biz_id=bk_biz_id, id=cluster_id)
+        cluster = Cluster.objects.prefetch_related(
+            Prefetch(
+                "storageinstance_set", queryset=StorageInstance.objects.select_related("machine"), to_attr="storages"
+            )
+        ).get(bk_biz_id=bk_biz_id, id=cluster_id)
+
         graph = scan_cluster(cluster).to_dict()
         return graph