fix(backend): 修复sqlserver集群重置没删除代办 TencentBlueKing#16155

Author: huangwentai-wendel

dbm-ui/backend/ticket/builders/sqlserver/sqlserver_reset.py

@@ -47,7 +47,7 @@ def format_ticket_data(self):
         pass
 
 
-@builders.BuilderFactory.register(TicketType.SQLSERVER_RESET)
+@builders.BuilderFactory.register(TicketType.SQLSERVER_RESET, phase=ClusterPhase.ONLINE)
 class SQLServerResetFlowBuilder(BaseSQLServerTicketFlowBuilder):
     serializer = SQLServerResetDetailSerializer
     inner_flow_builder = SQLServerResetFlowParamBuilder

dbm-ui/backend/ticket/flow_manager/manager.py

@@ -153,13 +153,10 @@ def ticket_status_trigger(self, origin_status, target_status):
             create_recycle_ticket.apply_async(args=(self.ticket.id, [], TicketType.RECYCLE_APPLY_HOST))
 
         # 如果是集群的禁用、启动、删除、sqlserver重置则处理相对应代办操作
-        if target_status == TicketStatus.SUCCEEDED and (
+        if (
             self.ticket.ticket_type in BuilderFactory.ticket_type__cluster_phase
-            or self.ticket.ticket_type == TicketType.SQLSERVER_RESET
+            and target_status == TicketStatus.SUCCEEDED
         ):
-            # sqlserver重置的前提是禁用成功，集群状态是 offline
-            if self.ticket.ticket_type == TicketType.SQLSERVER_RESET:
-                cluster_phase = "offline"
-            else:
-                cluster_phase = BuilderFactory.ticket_type__cluster_phase[self.ticket.ticket_type]
-            create_cluster_todo.apply_async(args=(self.ticket.id, cluster_phase, self.ticket.ticket_type))
+            create_cluster_todo.apply_async(
+                args=(self.ticket.id, BuilderFactory.ticket_type__cluster_phase[self.ticket.ticket_type])
+            )

dbm-ui/backend/ticket/tasks/ticket_tasks.py

@@ -387,7 +387,7 @@ def create_recycle_ticket(revoke_ticket_id: int, recycle_hosts: list, recycle_ty
 
 
 @shared_task
-def create_cluster_todo(ticket_id, cluster_phase, ticket_type):
+def create_cluster_todo(ticket_id, cluster_phase):
     from backend.ticket.todos import ClusterDisableTodoContext, TodoActionType
 
     logger.info("--------------------create_cluster_todo-----{}-{}".format(ticket_id, cluster_phase))
@@ -428,10 +428,7 @@ def create_cluster_todo(ticket_id, cluster_phase, ticket_type):
             ).first()
             if not todo:
                 continue
-            # 单据类型是sqlserver重置则获取RESET类型，清除对应的待办
-            if cluster_phase == ClusterPhase.ONLINE and ticket_type == TicketType.SQLSERVER_RESET:
-                action = TodoActionType.RESET
-            elif cluster_phase == ClusterPhase.ONLINE and ticket_type != TicketType.SQLSERVER_RESET:
+            if cluster_phase == ClusterPhase.ONLINE:
                 action = TodoActionType.ENABLE
             else:
                 action = TodoActionType.DESTROY

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

@@ -149,7 +149,6 @@ class TodoActionType(StrStructuredEnum):
     SKIP = EnumField("SKIP", _("跳过"))
     CHANGE = EnumField("CHANGE", _("变更"))
     ENABLE = EnumField("ENABLE", _("启用集群"))
-    RESET = EnumField("RESET", _("重置集群"))
     DESTROY = EnumField("DESTROY", _("删除集群"))