fix(backend): 密码随机化增加错误信息 #8290

TencentBlueKing · Nov 29, 2024 · 4756bb1 · 4756bb1
1 parent 96ced77
commit 4756bb1
Show file tree

Hide file tree

Showing 18 changed files with 11,661 additions and 7,892 deletions.
diff --git a/dbm-ui/backend/configuration/handlers/password.py b/dbm-ui/backend/configuration/handlers/password.py
@@ -25,7 +25,7 @@
 from backend.db_periodic_task.models import DBPeriodicTask
 from backend.db_services.ipchooser.query.resource import ResourceQueryHelper
 from backend.db_services.taskflow.handlers import TaskFlowHandler
-from backend.flow.consts import DEFAULT_INSTANCE, FAILED_STATES, SUCCEED_STATES
+from backend.flow.consts import DEFAULT_INSTANCE, SUCCEED_STATES
 from backend.flow.engine.bamboo.engine import BambooEngine
 from backend.flow.engine.controller.mysql import MySQLController
 from backend.flow.models import FlowTree
@@ -214,8 +214,8 @@ def query_async_modify_result(cls, root_id: str):
         @param root_id: 任务ID
         """
         flow_tree = FlowTree.objects.get(root_id=root_id)
-        # 任务未完成，退出
-        if flow_tree.status not in [*FAILED_STATES, *SUCCEED_STATES]:
+        # 任务未完成或失败，退出
+        if flow_tree.status not in [*SUCCEED_STATES]:
             return {"status": flow_tree.status, "data": ""}
 
         # 查询修改密码的节点id
@@ -224,8 +224,8 @@ def query_async_modify_result(cls, root_id: str):
             0
         ]
         # 查询输出数据
-        result = BambooEngine(root_id).get_node_output_data(node_id).data["resp"]["data"]
-        result.update(status=flow_tree.status)
+        resp = BambooEngine(root_id).get_node_output_data(node_id).data["resp"]
+        result = {"status": flow_tree.status, "error": resp["message"], "data": resp["data"], "result": resp["result"]}
         return result
 
     @classmethod

diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/common/bigdata_common_sub_flow.py b/dbm-ui/backend/flow/engine/bamboo/scene/common/bigdata_common_sub_flow.py
@@ -12,7 +12,7 @@
 from dataclasses import asdict
 from typing import List
 
-from django.utils.translation import gettext as _
+from django.utils.translation import ugettext as _
 
 from backend import env
 from backend.components import CCApi

diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/common/builder.py b/dbm-ui/backend/flow/engine/bamboo/scene/common/builder.py
@@ -86,7 +86,7 @@ def create_random_pass_act(self):
         流程串联添加临时账号的活动节点
         """
         act = self.add_act(
-            act_name="create job user",
+            act_name="create temp job account",
             act_component_code=AddTempUserForClusterComponent.code,
             kwargs={"cluster_ids": self.need_random_pass_cluster_ids},
         )

diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/sqlserver/build_database_sync.py b/dbm-ui/backend/flow/engine/bamboo/scene/sqlserver/build_database_sync.py
@@ -62,7 +62,7 @@ def run_flow(self):
 
             # 创建随机账号
             sub_pipeline.add_act(
-                act_name=_("create job user"),
+                act_name=_("create temp job account"),
                 act_component_code=SqlserverAddJobUserComponent.code,
                 kwargs=asdict(
                     CreateRandomJobUserKwargs(
@@ -94,7 +94,7 @@ def run_flow(self):
 
             # 删除随机账号
             sub_pipeline.add_act(
-                act_name=_("drop job user"),
+                act_name=_("remove temp job account"),
                 act_component_code=SqlserverDropJobUserComponent.code,
                 kwargs=asdict(DropRandomJobUserKwargs(cluster_ids=[cluster.id])),
             )

diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/sqlserver/sqlserver_add_slave.py b/dbm-ui/backend/flow/engine/bamboo/scene/sqlserver/sqlserver_add_slave.py
@@ -144,7 +144,7 @@ def run_flow(self):
 
                 # 创建随机账号
                 cluster_sub_pipeline.add_act(
-                    act_name=_("create job user"),
+                    act_name=_("create temp job account"),
                     act_component_code=SqlserverAddJobUserComponent.code,
                     kwargs=asdict(
                         CreateRandomJobUserKwargs(
@@ -202,7 +202,7 @@ def run_flow(self):
 
                 # 删除随机账号
                 cluster_sub_pipeline.add_act(
-                    act_name=_("drop job user"),
+                    act_name=_("remove temp job account"),
                     act_component_code=SqlserverDropJobUserComponent.code,
                     kwargs=asdict(
                         DropRandomJobUserKwargs(

diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/sqlserver/sqlserver_backup_dbs.py b/dbm-ui/backend/flow/engine/bamboo/scene/sqlserver/sqlserver_backup_dbs.py
@@ -76,7 +76,7 @@ def run_flow(self):
 
             # 创建随机账号
             sub_pipeline.add_act(
-                act_name=_("create job user"),
+                act_name=_("create temp job account"),
                 act_component_code=SqlserverAddJobUserComponent.code,
                 kwargs=asdict(
                     CreateRandomJobUserKwargs(
@@ -128,7 +128,7 @@ def run_flow(self):
 
             # 删除随机账号
             sub_pipeline.add_act(
-                act_name=_("drop job user"),
+                act_name=_("remove temp job account"),
                 act_component_code=SqlserverDropJobUserComponent.code,
                 kwargs=asdict(DropRandomJobUserKwargs(cluster_ids=[cluster.id])),
             )

diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/sqlserver/sqlserver_clean_dbs.py b/dbm-ui/backend/flow/engine/bamboo/scene/sqlserver/sqlserver_clean_dbs.py
@@ -90,7 +90,7 @@ def run_flow(self):
 
             # 创建随机账号
             sub_pipeline.add_act(
-                act_name=_("create job user"),
+                act_name=_("create temp job account"),
                 act_component_code=SqlserverAddJobUserComponent.code,
                 kwargs=asdict(
                     CreateRandomJobUserKwargs(
@@ -136,7 +136,7 @@ def run_flow(self):
 
             # 删除随机账号
             sub_pipeline.add_act(
-                act_name=_("drop job user"),
+                act_name=_("remove temp job account"),
                 act_component_code=SqlserverDropJobUserComponent.code,
                 kwargs=asdict(DropRandomJobUserKwargs(cluster_ids=[cluster.id])),
             )

diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/sqlserver/sqlserver_cluster_disable.py b/dbm-ui/backend/flow/engine/bamboo/scene/sqlserver/sqlserver_cluster_disable.py
@@ -76,7 +76,7 @@ def run_flow(self):
 
             # 创建随机账号
             sub_pipeline.add_act(
-                act_name=_("create job user"),
+                act_name=_("create temp job account"),
                 act_component_code=SqlserverAddJobUserComponent.code,
                 kwargs=asdict(
                     CreateRandomJobUserKwargs(
@@ -154,7 +154,7 @@ def run_flow(self):
 
             # 删除随机账号
             sub_pipeline.add_act(
-                act_name=_("drop job user"),
+                act_name=_("remove temp job account"),
                 act_component_code=SqlserverDropJobUserComponent.code,
                 kwargs=asdict(DropRandomJobUserKwargs(cluster_ids=[cluster.id])),
             )

diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/sqlserver/sqlserver_cluster_reset.py b/dbm-ui/backend/flow/engine/bamboo/scene/sqlserver/sqlserver_cluster_reset.py
@@ -108,7 +108,7 @@ def run_flow(self):
 
             # 创建随机账号
             sub_pipeline.add_act(
-                act_name=_("create job user"),
+                act_name=_("create temp job account"),
                 act_component_code=SqlserverAddJobUserComponent.code,
                 kwargs=asdict(
                     CreateRandomJobUserKwargs(
@@ -257,7 +257,7 @@ def run_flow(self):
 
             # 删除随机账号
             sub_pipeline.add_act(
-                act_name=_("drop job user"),
+                act_name=_("remove temp job account"),
                 act_component_code=SqlserverDropJobUserComponent.code,
                 kwargs=asdict(DropRandomJobUserKwargs(cluster_ids=[cluster.id])),
             )

diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/sqlserver/sqlserver_db_construct.py b/dbm-ui/backend/flow/engine/bamboo/scene/sqlserver/sqlserver_db_construct.py
@@ -186,7 +186,7 @@ def run_flow(self):
 
             # 创建随机账号
             sub_pipeline.add_act(
-                act_name=_("create job user"),
+                act_name=_("create temp job account"),
                 act_component_code=SqlserverAddJobUserComponent.code,
                 kwargs=asdict(
                     CreateRandomJobUserKwargs(
@@ -297,7 +297,7 @@ def run_flow(self):
 
             # 删除随机账号
             sub_pipeline.add_act(
-                act_name=_("drop job user"),
+                act_name=_("remove temp job account"),
                 act_component_code=SqlserverDropJobUserComponent.code,
                 kwargs=asdict(DropRandomJobUserKwargs(cluster_ids=[target_cluster.id])),
             )

diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/sqlserver/sqlserver_dts.py b/dbm-ui/backend/flow/engine/bamboo/scene/sqlserver/sqlserver_dts.py
@@ -125,7 +125,7 @@ def full_dts_flow(self):
 
             # 创建随机账号
             sub_pipeline.add_act(
-                act_name=_("create job user"),
+                act_name=_("create temp job account"),
                 act_component_code=SqlserverAddJobUserComponent.code,
                 kwargs=asdict(
                     CreateRandomJobUserKwargs(
@@ -290,7 +290,7 @@ def full_dts_flow(self):
 
             # 删除随机账号
             sub_pipeline.add_act(
-                act_name=_("drop job user"),
+                act_name=_("remove temp job account"),
                 act_component_code=SqlserverDropJobUserComponent.code,
                 kwargs=asdict(DropRandomJobUserKwargs(cluster_ids=[cluster.id, target_cluster.id])),
             )
@@ -364,7 +364,7 @@ def incr_dts_flow(self):
 
             # 创建随机账号
             sub_pipeline.add_act(
-                act_name=_("create job user"),
+                act_name=_("create temp job account"),
                 act_component_code=SqlserverAddJobUserComponent.code,
                 kwargs=asdict(
                     CreateRandomJobUserKwargs(
@@ -484,7 +484,7 @@ def incr_dts_flow(self):
 
             # 删除随机账号
             sub_pipeline.add_act(
-                act_name=_("drop job user"),
+                act_name=_("remove temp job account"),
                 act_component_code=SqlserverDropJobUserComponent.code,
                 kwargs=asdict(DropRandomJobUserKwargs(cluster_ids=[cluster.id, target_cluster.id])),
             )

diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/sqlserver/sqlserver_master_slave_switch.py b/dbm-ui/backend/flow/engine/bamboo/scene/sqlserver/sqlserver_master_slave_switch.py
@@ -136,7 +136,7 @@ def run_flow(self):
 
                 # 创建随机账号
                 cluster_pipeline.add_act(
-                    act_name=_("create job user"),
+                    act_name=_("create temp job account"),
                     act_component_code=SqlserverAddJobUserComponent.code,
                     kwargs=asdict(
                         CreateRandomJobUserKwargs(
@@ -196,7 +196,7 @@ def run_flow(self):
 
                 # 删除随机账号
                 cluster_pipeline.add_act(
-                    act_name=_("drop job user"),
+                    act_name=_("remove temp job account"),
                     act_component_code=SqlserverDropJobUserComponent.code,
                     kwargs=asdict(DropRandomJobUserKwargs(cluster_ids=[cluster.id])),
                 )

diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/sqlserver/sqlserver_rename_dbs.py b/dbm-ui/backend/flow/engine/bamboo/scene/sqlserver/sqlserver_rename_dbs.py
@@ -90,7 +90,7 @@ def run_flow(self):
 
             # 创建随机账号
             sub_pipeline.add_act(
-                act_name=_("create job user"),
+                act_name=_("create temp job account"),
                 act_component_code=SqlserverAddJobUserComponent.code,
                 kwargs=asdict(
                     CreateRandomJobUserKwargs(
@@ -136,7 +136,7 @@ def run_flow(self):
 
             # 删除随机账号
             sub_pipeline.add_act(
-                act_name=_("drop job user"),
+                act_name=_("remove temp job account"),
                 act_component_code=SqlserverDropJobUserComponent.code,
                 kwargs=asdict(DropRandomJobUserKwargs(cluster_ids=[cluster.id])),
             )

diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/sqlserver/sqlserver_slave_rebuild.py b/dbm-ui/backend/flow/engine/bamboo/scene/sqlserver/sqlserver_slave_rebuild.py
@@ -120,7 +120,7 @@ def slave_rebuild_in_local_flow(self):
 
             # 创建随机账号
             sub_pipeline.add_act(
-                act_name=_("create job user"),
+                act_name=_("create temp job account"),
                 act_component_code=SqlserverAddJobUserComponent.code,
                 kwargs=asdict(
                     CreateRandomJobUserKwargs(
@@ -230,7 +230,7 @@ def slave_rebuild_in_local_flow(self):
 
             # 删除随机账号
             sub_pipeline.add_act(
-                act_name=_("drop job user"),
+                act_name=_("remove temp job account"),
                 act_component_code=SqlserverDropJobUserComponent.code,
                 kwargs=asdict(DropRandomJobUserKwargs(cluster_ids=[cluster.id])),
             )
@@ -304,7 +304,7 @@ def slave_rebuild_in_new_slave_flow(self):
 
                 # 创建随机账号
                 cluster_sub_pipeline.add_act(
-                    act_name=_("create job user"),
+                    act_name=_("create temp job account"),
                     act_component_code=SqlserverAddJobUserComponent.code,
                     kwargs=asdict(
                         CreateRandomJobUserKwargs(
@@ -428,7 +428,7 @@ def slave_rebuild_in_new_slave_flow(self):
 
                 # 删除随机账号
                 cluster_sub_pipeline.add_act(
-                    act_name=_("drop job user"),
+                    act_name=_("remove temp job account"),
                     act_component_code=SqlserverDropJobUserComponent.code,
                     kwargs=asdict(
                         DropRandomJobUserKwargs(

diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/sqlserver/sqlserver_sql_execute.py b/dbm-ui/backend/flow/engine/bamboo/scene/sqlserver/sqlserver_sql_execute.py
@@ -137,7 +137,7 @@ def run_flow(self):
 
             # 创建随机账号
             sub_pipeline.add_act(
-                act_name=_("create job user"),
+                act_name=_("create temp job account"),
                 act_component_code=SqlserverAddJobUserComponent.code,
                 kwargs=asdict(
                     CreateRandomJobUserKwargs(
@@ -162,7 +162,7 @@ def run_flow(self):
 
             # 删除随机账号
             sub_pipeline.add_act(
-                act_name=_("drop job user"),
+                act_name=_("remove temp job account"),
                 act_component_code=SqlserverDropJobUserComponent.code,
                 kwargs=asdict(DropRandomJobUserKwargs(cluster_ids=[cluster.id])),
             )

diff --git a/dbm-ui/backend/ticket/builders/mysql/mysql_master_slave_switch.py b/dbm-ui/backend/ticket/builders/mysql/mysql_master_slave_switch.py
@@ -131,6 +131,14 @@ def custom_ticket_flows(self):
         ]
         # 如果存在dumper，则串dumper迁移流程
         if self.check_cluster_dumper_migrate(self.ticket):
+            flows.append(
+                Flow(
+                    ticket=self.ticket,
+                    flow_type=FlowType.PAUSE.value,
+                    details=self.pause_node_builder(self.ticket).get_params(),
+                    flow_alias=_("人工确认"),
+                ),
+            )
             flows.append(
                 Flow(
                     ticket=self.ticket,