From d9120385b05a85cc28b32f818847a348d1c973ad Mon Sep 17 00:00:00 2001 From: iSecloud <869820505@qq.com> Date: Thu, 12 Dec 2024 17:04:54 +0800 Subject: [PATCH] =?UTF-8?q?feat(backend):=20=E5=8D=95=E6=8D=AE=E4=BA=92?= =?UTF-8?q?=E6=96=A5=E5=8F=AF=E4=B8=B4=E6=97=B6=E4=BF=AE=E6=94=B9=20&=20?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE=E9=80=BB=E8=BE=91=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=20#8576?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dbm-ui/backend/configuration/constants.py | 1 + dbm-ui/backend/configuration/models/system.py | 2 +- dbm-ui/backend/ticket/apps.py | 2 ++ .../ticket/builders/mysql/mysql_dump_data.py | 24 ++++++++----- dbm-ui/backend/ticket/exclusive_ticket.xlsx | Bin 32576 -> 32743 bytes dbm-ui/backend/ticket/models/ticket.py | 34 ++++++++++-------- 6 files changed, 39 insertions(+), 24 deletions(-) diff --git a/dbm-ui/backend/configuration/constants.py b/dbm-ui/backend/configuration/constants.py index 0b8a8824bf..9a77ceadfe 100644 --- a/dbm-ui/backend/configuration/constants.py +++ b/dbm-ui/backend/configuration/constants.py @@ -113,6 +113,7 @@ class SystemSettingsEnum(str, StructuredEnum): AFFINITY = EnumField("AFFINITY", _("容灾要求(各个环境可能不同，比如SG为空)")) SYSTEM_MSG_TYPE = EnumField("SYSTEM_MSG_TYPE", _("系统消息通知方式")) PADDING_PROXY_CLUSTER_LIST = EnumField("PADDING_PROXY_CLUSTER_LIST", _("补全proxy的集群域名列表")) + EXCLUSIVE_TICKET_MAP = EnumField("EXCLUSIVE_TICKET_MAP", _("单据互斥表(全局)")) # ITSM配置 BK_ITSM_SERVICE_ID = EnumField("BK_ITSM_SERVICE_ID", _("DBM的流程服务ID")) ITSM_APPROVAL_KEY = EnumField("ITSM_APPROVAL_KEY", _("ITSM审批意见key")) diff --git a/dbm-ui/backend/configuration/models/system.py b/dbm-ui/backend/configuration/models/system.py index d26b3bd82d..9698f1b66c 100644 --- a/dbm-ui/backend/configuration/models/system.py +++ b/dbm-ui/backend/configuration/models/system.py @@ -117,7 +117,7 @@ def insert_setting_value(cls, key: str, value: Any, value_type: str = "str", use ) @classmethod - def get_external_whitelist_cluster_ids(cls) -> List[int]: + def get_external_whitelist_cluster_ids(cls) -> List: return [ conf["cluster_id"] for conf in cls.get_setting_value( diff --git a/dbm-ui/backend/ticket/apps.py b/dbm-ui/backend/ticket/apps.py index 70cc495143..8fedb2a5d2 100644 --- a/dbm-ui/backend/ticket/apps.py +++ b/dbm-ui/backend/ticket/apps.py @@ -18,9 +18,11 @@ def init_ticket_flow_config(sender, **kwargs): from backend.ticket.handler import TicketHandler + from backend.ticket.models import ClusterOperateRecord try: TicketHandler.ticket_flow_config_init() + ClusterOperateRecord.objects.get_exclusive_ticket_map(force=True) except Exception as err: # pylint: disable=broad-except: logger.warning(f"ticket_flow_config_init occur error, {err}") diff --git a/dbm-ui/backend/ticket/builders/mysql/mysql_dump_data.py b/dbm-ui/backend/ticket/builders/mysql/mysql_dump_data.py index 9b6f6efdc5..5d070b030d 100644 --- a/dbm-ui/backend/ticket/builders/mysql/mysql_dump_data.py +++ b/dbm-ui/backend/ticket/builders/mysql/mysql_dump_data.py @@ -36,17 +36,16 @@ class MySQLDumpDataDetailSerializer(MySQLBaseOperateDetailSerializer): dump_data = serializers.BooleanField(help_text=_("是否导出表数据")) force = serializers.BooleanField(help_text=_("是否强制执行"), default=False) + def to_internal_value(self, data): + data = super().to_internal_value(data) + data["is_external"] = getattr(self.context["request"], "is_external", False) + return data + class MySQLDumpDataItsmFlowParamsBuilder(builders.ItsmParamBuilder): - def get_params(self): - params = super().get_params() - bk_biz_id = self.ticket.bk_biz_id - # 数据导出的审批人是该业务下的产品，如果没有产品则按照原来审批人 - approve_index = [field["key"] for field in params["fields"]].index("approver") - old_approver = params["fields"].pop(approve_index)["value"] - biz_productor = AppCache.get_app_attr_from_cc(bk_biz_id, attr_name="bk_biz_productor") or old_approver - params["fields"].append({"key": "approver", "value": biz_productor}) - return params + def get_approvers(self): + bk_biz_maintainer = AppCache.get_app_attr_from_cc(self.ticket.bk_biz_id, attr_name="bk_biz_maintainer") + return bk_biz_maintainer or super().get_approvers() class MySQLDumpDataFlowParamBuilder(builders.FlowParamBuilder): @@ -77,3 +76,10 @@ class MySQLDumpDataFlowBuilder(BaseMySQLTicketFlowBuilder): inner_flow_builder = MySQLDumpDataFlowParamBuilder inner_flow_name = _("数据导出执行") itsm_flow_builder = MySQLDumpDataItsmFlowParamsBuilder + + @property + def need_itsm(self): + # 1. 导出数据和表结构 ：运维人员审批 + # 2.导出数据 ：运维人员审批 + # 3.导出表结构 ：正常情况 - 不需要审批，PO环境 - 运维人员审批 + return self.ticket.details["dump_data"] or self.ticket.details["is_external"] diff --git a/dbm-ui/backend/ticket/exclusive_ticket.xlsx b/dbm-ui/backend/ticket/exclusive_ticket.xlsx index 8087278412047b1f604d411c9b889a1d5d6e0f74..ada7c063a11f8ea3a33c3212caa6b79b31ed3be7 100644 GIT binary patch delta 12964 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 diff --git a/dbm-ui/backend/ticket/models/ticket.py b/dbm-ui/backend/ticket/models/ticket.py index c96287be4d..ef40b5bb84 100644 --- a/dbm-ui/backend/ticket/models/ticket.py +++ b/dbm-ui/backend/ticket/models/ticket.py @@ -20,7 +20,8 @@ from backend import env from backend.bk_web.constants import LEN_L_LONG, LEN_LONG, LEN_NORMAL, LEN_SHORT from backend.bk_web.models import AuditedModel -from backend.configuration.constants import PLAT_BIZ_ID, DBType +from backend.configuration.constants import PLAT_BIZ_ID, DBType, SystemSettingsEnum +from backend.configuration.models import SystemSettings from backend.db_monitor.exceptions import AutofixException from backend.ticket.constants import ( EXCLUSIVE_TICKET_EXCEL_PATH, @@ -272,13 +273,13 @@ def filter_actives(self, cluster_id, *args, **kwargs): return self.filter(cluster_id=cluster_id, ticket__status=TicketFlowStatus.RUNNING, *args, **kwargs) def filter_inner_actives(self, cluster_id, *args, **kwargs): - """获取集群正在运行的inner flow的单据记录。此时认为集群会在互斥阶段""" + """获取集群正在 运行/失败 的inner flow的单据记录。此时认为集群会在互斥阶段""" # 排除特定的单据，如自身单据重试排除自身 exclude_ticket_ids = kwargs.pop("exclude_ticket_ids", []) return self.filter( cluster_id=cluster_id, flow__flow_type=FlowType.INNER_FLOW, - flow__status=TicketFlowStatus.RUNNING, + flow__status__in=[TicketFlowStatus.RUNNING, TicketFlowStatus.FAILED], *args, **kwargs, ).exclude(flow__ticket_id__in=exclude_ticket_ids) @@ -290,28 +291,33 @@ def get_cluster_operations(self, cluster_id, **kwargs): def has_exclusive_operations(self, ticket_type, cluster_id, **kwargs): """判断当前单据类型与集群正在进行中的单据是否互斥""" active_records = self.filter_inner_actives(cluster_id, **kwargs) + exclusive_ticket_map = self.get_exclusive_ticket_map() exclusive_infos = [] for record in active_records: active_ticket_type = record.ticket.ticket_type # 记录互斥信息。不存在互斥表默认为互斥 - if self.exclusive_ticket_map[ticket_type].get(active_ticket_type, True): + if exclusive_ticket_map[ticket_type].get(active_ticket_type, True): exclusive_infos.append({"exclusive_ticket": record.ticket, "root_id": record.flow.flow_obj_id}) return exclusive_infos - @property - def exclusive_ticket_map(self): - if hasattr(self, "_exclusive_ticket_map"): - return self._exclusive_ticket_map + @staticmethod + def get_exclusive_ticket_map(force=False): + """获取单据互斥状态表, force为True表示强制刷新""" + exclusive_map = SystemSettings.get_setting_value(key=SystemSettingsEnum.EXCLUSIVE_TICKET_MAP, default={}) + if exclusive_map and not force: + return exclusive_map - _exclusive_matrix = ExcelHandler.paser_matrix(EXCLUSIVE_TICKET_EXCEL_PATH) - _exclusive_ticket_map = defaultdict(dict) - for row_label, inner_dict in _exclusive_matrix.items(): + exclusive_map = defaultdict(dict) + exclusive_matrix = ExcelHandler.paser_matrix(EXCLUSIVE_TICKET_EXCEL_PATH) + for row_label, inner_dict in exclusive_matrix.items(): for col_label, value in inner_dict.items(): row_key, col_key = TicketType.get_choice_value(row_label), TicketType.get_choice_value(col_label) - _exclusive_ticket_map[row_key][col_key] = value == "N" + exclusive_map[row_key][col_key] = value == "N" - setattr(self, "_exclusive_ticket_map", _exclusive_ticket_map) - return self._exclusive_ticket_map + SystemSettings.insert_setting_value( + key=SystemSettingsEnum.EXCLUSIVE_TICKET_MAP, value=exclusive_map, value_type="dict" + ) + return exclusive_map class ClusterOperateRecord(AuditedModel):