fix(mysql): mysql备份单据调整v2 TencentBlueKing#8142

xfwduke · Nov 25, 2024 · 9cde966 · 9cde966
1 parent b5a7e30
commit 9cde966
Show file tree

Hide file tree

Showing 25 changed files with 1,025 additions and 634 deletions.
diff --git a/dbm-services/mysql/db-tools/dbactuator/internal/subcmd/mysqlcmd/backup_database_table.go b/dbm-services/mysql/db-tools/dbactuator/internal/subcmd/mysqlcmd/backup_database_table.go
diff --git a/dbm-services/mysql/db-tools/dbactuator/internal/subcmd/mysqlcmd/backup_demand.go b/dbm-services/mysql/db-tools/dbactuator/internal/subcmd/mysqlcmd/backup_demand.go
@@ -52,6 +52,8 @@ func (d *BackupDemandAct) Init() (err error) {
 		logger.Error("DeserializeAndValidate err %s", err.Error())
 		return err
 	}
+
+	d.Payload.GeneralParam = subcmd.GeneralRuntimeParam
 	logger.Warn("params %+v", d.Payload.Params)
 
 	return
@@ -74,6 +76,10 @@ func (d *BackupDemandAct) Run() (err error) {
 			FunName: "生成备份配置",
 			Func:    d.Payload.GenerateBackupConfig,
 		},
+		{
+			FunName: "终止残留备份进程",
+			Func:    d.Payload.KillLegacyBackup,
+		},
 		{
 			FunName: "执行备份",
 			Func:    d.Payload.DoBackup,