fix(backend): tendbcluster定点构造v2 TencentBlueKing#14364

Author: v_ycggyao

dbm-ui/backend/db_services/dbbase/resources/query.py

@@ -345,12 +345,14 @@ def export_instance(cls, bk_biz_id: int, bk_host_ids: list) -> HttpResponse:
         return ExcelHandler.response(wb, f"{biz_name}({bk_biz_id}){db_type}_instances.xlsx")
 
     @classmethod
-    def get_temporary_cluster_info(cls, cluster, ticket_type):
+    def get_temporary_cluster_info(cls, cluster, ticket_types):
         """如果当前集群是临时集群，则补充临时集群相关信息。"""
         tags = [tag.key for tag in cluster.tags.all() if tag.system]
         if SystemTagEnum.TEMPORARY.value not in tags:
             return {}
-        record = ClusterOperateRecord.objects.filter(cluster_id=cluster.id, ticket__ticket_type=ticket_type).first()
+        record = ClusterOperateRecord.objects.filter(
+            cluster_id=cluster.id, ticket__ticket_type__in=ticket_types
+        ).first()
         # 临时集群名称的构造规则是: {cluster_name}_{20201212}_{ticket_id}
         source_cluster_name = cluster.alias.rsplit("-", 2)[0]
         # 获取回档源集群信息，如果源集群已被卸载，则忽略

dbm-ui/backend/db_services/mongodb/resources/query.py

@@ -278,7 +278,7 @@ def _to_cluster_representation(
             "shard_num": shard_num,  # 集群分片数
             "shard_node_count": shard_node_count,  # 每分片节点数
             "single_host_shard_num": single_host_shard_num,  # 获取单机分片数
-            "temporary_info": cls.get_temporary_cluster_info(cluster, TicketType.MONGODB_PITR_RESTORE),
+            "temporary_info": cls.get_temporary_cluster_info(cluster, [TicketType.MONGODB_PITR_RESTORE]),
             "disaster_tolerance_level": cluster.disaster_tolerance_level,
         }
         cluster_info = super()._to_cluster_representation(

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

@@ -205,6 +205,12 @@ def _to_cluster_representation(
         # 获取集群规格
         spec_id = cluster.storages[0].machine.spec_id
         spec = kwargs["remote_spec_map"].get(spec_id)
+        temporary_ticket_type = [
+            TicketType.TENDBCLUSTER_ROLLBACK_CLUSTER,
+            TicketType.TENDBCLUSTER_ROLLBACK,
+            TicketType.TENDBCLUSTER_FIXPOINT_NEW,
+            TicketType.TENDBCLUSTER_FIXPOINT_EXIST,
+        ]
         cluster_extra_info = {
             "cluster_spec": model_to_dict(spec) if spec else None,
             "cluster_capacity": spec.capacity * machine_pair_cnt if spec else None,
@@ -216,7 +222,7 @@ def _to_cluster_representation(
             "machine_pair_cnt": machine_pair_cnt,
             "remote_db": remote_db,
             "remote_dr": remote_dr,
-            "temporary_info": cls.get_temporary_cluster_info(cluster, TicketType.TENDBCLUSTER_ROLLBACK_CLUSTER),
+            "temporary_info": cls.get_temporary_cluster_info(cluster, temporary_ticket_type),
         }
         cluster_info = super()._to_cluster_representation(
             cluster,

dbm-ui/backend/ticket/builders/tendbcluster/tendb_fixpoint_rollback.py

@@ -58,6 +58,9 @@ class RollbackHostSerializer(serializers.Serializer):
         )
         tables = serializers.ListField(help_text=_("目标table列表"), child=DBTableField())
         tables_ignore = serializers.ListField(help_text=_("忽略table列表"), child=DBTableField(), required=False)
+        affect_database_list = serializers.ListField(
+            help_text=_("影响的DB"), child=serializers.CharField(), allow_null=True, required=False
+        )
 
     rollback_cluster_type = serializers.ChoiceField(
         help_text=_("回档集群类型"), choices=RollbackBuildClusterType.get_choices()
@@ -254,3 +257,18 @@ def describe_ticket_flows(cls, flow_config_map):
         flow_desc = cls._add_itsm_pause_describe(flow_desc=[], flow_config_map=flow_config_map)
         flow_desc.extend([_("回档临时集群部署"), _("TenDBCluster 回档执行")])
         return flow_desc
+
+
+@builders.BuilderFactory.register(TicketType.TENDBCLUSTER_FIXPOINT_NEW, is_apply=True)
+class TendbFixPointFlowNewClusterBuilder(TendbFixPointRollbackFlowBuilder):
+    inner_flow_name = _("定点构造执行")
+
+
+@builders.BuilderFactory.register(TicketType.TENDBCLUSTER_FIXPOINT_EXIST, is_apply=True)
+class TendbFixPointFlowExistClusterBuilder(TendbFixPointRollbackFlowBuilder):
+    inner_flow_name = _("定点构造执行")
+
+
+@builders.BuilderFactory.register(TicketType.TENDBCLUSTER_ROLLBACK, is_apply=True)
+class TendbRollbackFlowBuilder(TendbFixPointRollbackFlowBuilder):
+    inner_flow_name = _("定点回档执行")

dbm-ui/backend/ticket/constants.py

@@ -387,8 +387,10 @@ def get_approve_mode_by_ticket(cls, ticket_type):
     TENDBCLUSTER_NODE_REBALANCE = TicketEnumField("TENDBCLUSTER_NODE_REBALANCE", _("TenDB Cluster 集群容量变更"),
                                                   _("集群维护"))  # noqa
     TENDBCLUSTER_FULL_BACKUP = TicketEnumField("TENDBCLUSTER_FULL_BACKUP", _("TenDB Cluster 全库备份"), _("备份"))
-    TENDBCLUSTER_ROLLBACK_CLUSTER = TicketEnumField("TENDBCLUSTER_ROLLBACK_CLUSTER", _("TenDB Cluster 定点构造"),
-                                                    _("回档"))  # noqa
+    TENDBCLUSTER_ROLLBACK_CLUSTER = TicketEnumField("TENDBCLUSTER_ROLLBACK_CLUSTER", _("TenDB Cluster 定点构造"), _("回档"))  # noqa
+    TENDBCLUSTER_ROLLBACK = TicketEnumField("TENDBCLUSTER_ROLLBACK", _("TENDBCLUSTER 构造回档"), _("回档"))
+    TENDBCLUSTER_FIXPOINT_NEW = TicketEnumField("TENDBCLUSTER_FIXPOINT_NEW", _("TENDBCLUSTER 数据构造到新集群"), _("构造"))
+    TENDBCLUSTER_FIXPOINT_EXIST = TicketEnumField("TENDBCLUSTER_FIXPOINT_EXIST", _("TENDBCLUSTER 数据构造到已有集群"), _("构造"))
     TENDBCLUSTER_FLASHBACK = TicketEnumField("TENDBCLUSTER_FLASHBACK", _("TenDB Cluster 闪回"), _("回档"))
     TENDBCLUSTER_CLIENT_CLONE_RULES = TicketEnumField("TENDBCLUSTER_CLIENT_CLONE_RULES",
                                                       _("TenDB Cluster 客户端权限克隆"), _("权限管理"))  # noqa