From 25f12509f7d14a598243530566e4b04ccbfe48c1 Mon Sep 17 00:00:00 2001 From: zfrendo <842557664@qq.com> Date: Fri, 15 Nov 2024 16:31:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=9A=E7=82=B9?= =?UTF-8?q?=E5=9B=9E=E6=A1=A3=E5=A4=87=E4=BB=BD=E6=97=B6=E9=97=B4key?= =?UTF-8?q?=E9=94=99=E8=AF=AF=20#7984?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dbm-ui/backend/configuration/constants.py | 2 +- .../bamboo/scene/mysql/common/mysql_resotre_data_sub_flow.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dbm-ui/backend/configuration/constants.py b/dbm-ui/backend/configuration/constants.py index 3b5040e89d..b8d4471082 100644 --- a/dbm-ui/backend/configuration/constants.py +++ b/dbm-ui/backend/configuration/constants.py @@ -19,7 +19,7 @@ # sqlserver的用户登录admin账号名称 SQLSERVER_ADMIN_USER = "dbm_admin" # TODO: job超时时间最大为86400,后续考虑让job平台调大限制 -MYSQL_DATA_RESTORE_TIME = 86400 +MYSQL_DATA_RESTORE_TIME = 259200 MYSQL_USUAL_JOB_TIME = 7200 MYSQL8_VER_PARSE_NUM = 8000000 diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/mysql/common/mysql_resotre_data_sub_flow.py b/dbm-ui/backend/flow/engine/bamboo/scene/mysql/common/mysql_resotre_data_sub_flow.py index 81a697284f..dff216709b 100644 --- a/dbm-ui/backend/flow/engine/bamboo/scene/mysql/common/mysql_resotre_data_sub_flow.py +++ b/dbm-ui/backend/flow/engine/bamboo/scene/mysql/common/mysql_resotre_data_sub_flow.py @@ -221,6 +221,7 @@ def mysql_rollback_data_sub_flow( if is_rollback_binlog: backup_time = str2datetime(backup_info["backup_time"], "%Y-%m-%d %H:%M:%S") + cluster["backup_time"] = backup_time binlog_result = get_backup_binlog( cluster_id=cluster_model.id, start_time=backup_time,