diff --git a/pkg/restore/db.go b/pkg/restore/db.go index 9ce3b10c7..be24a1ad9 100644 --- a/pkg/restore/db.go +++ b/pkg/restore/db.go @@ -47,7 +47,7 @@ func NewDB(g glue.Glue, store kv.Storage) (*DB, error) { func (db *DB) ExecDDL(ctx context.Context, ddlJob *model.Job) error { var err error if ddlJob.BinlogInfo.TableInfo != nil { - switchDbSQL := fmt.Sprintf("use %s;", ddlJob.SchemaName) + switchDbSQL := fmt.Sprintf("use %s;", utils.EncloseName(ddlJob.SchemaName)) err = db.se.Execute(ctx, switchDbSQL) if err != nil { log.Error("switch db failed", diff --git a/pkg/task/backup.go b/pkg/task/backup.go index 8d9613047..5944a22a0 100644 --- a/pkg/task/backup.go +++ b/pkg/task/backup.go @@ -91,6 +91,7 @@ func (cfg *BackupConfig) ParseFromFlags(flags *pflag.FlagSet) error { // RunBackup starts a backup task inside the current goroutine. func RunBackup(c context.Context, g glue.Glue, cmdName string, cfg *BackupConfig) error { + defer summary.Summary(cmdName) ctx, cancel := context.WithCancel(c) defer cancel() @@ -121,8 +122,6 @@ func RunBackup(c context.Context, g glue.Glue, cmdName string, cfg *BackupConfig return err } - defer summary.Summary(cmdName) - ranges, backupSchemas, err := backup.BuildBackupRangeAndSchema( mgr.GetDomain(), mgr.GetTiKV(), tableFilter, backupTS) if err != nil { diff --git a/pkg/task/backup_raw.go b/pkg/task/backup_raw.go index 55299bbb1..d9deaccba 100644 --- a/pkg/task/backup_raw.go +++ b/pkg/task/backup_raw.go @@ -83,6 +83,7 @@ func (cfg *RawKvConfig) ParseFromFlags(flags *pflag.FlagSet) error { // RunBackupRaw starts a backup task inside the current goroutine. func RunBackupRaw(c context.Context, g glue.Glue, cmdName string, cfg *RawKvConfig) error { + defer summary.Summary(cmdName) ctx, cancel := context.WithCancel(c) defer cancel() @@ -104,8 +105,6 @@ func RunBackupRaw(c context.Context, g glue.Glue, cmdName string, cfg *RawKvConf return err } - defer summary.Summary(cmdName) - backupRange := rtree.Range{StartKey: cfg.StartKey, EndKey: cfg.EndKey} // The number of regions need to backup diff --git a/pkg/task/restore.go b/pkg/task/restore.go index a4598baa9..7d5dd6846 100644 --- a/pkg/task/restore.go +++ b/pkg/task/restore.go @@ -73,6 +73,7 @@ func (cfg *RestoreConfig) ParseFromFlags(flags *pflag.FlagSet) error { // RunRestore starts a restore task inside the current goroutine. func RunRestore(c context.Context, g glue.Glue, cmdName string, cfg *RestoreConfig) error { + defer summary.Summary(cmdName) ctx, cancel := context.WithCancel(c) defer cancel() @@ -105,8 +106,6 @@ func RunRestore(c context.Context, g glue.Glue, cmdName string, cfg *RestoreConf return err } - defer summary.Summary(cmdName) - u, _, backupMeta, err := ReadBackupMeta(ctx, utils.MetaFile, &cfg.Config) if err != nil { return err diff --git a/pkg/task/restore_raw.go b/pkg/task/restore_raw.go index 3d60df1cd..308a44b4e 100644 --- a/pkg/task/restore_raw.go +++ b/pkg/task/restore_raw.go @@ -47,6 +47,7 @@ func (cfg *RestoreRawConfig) ParseFromFlags(flags *pflag.FlagSet) error { // RunRestoreRaw starts a raw kv restore task inside the current goroutine. func RunRestoreRaw(c context.Context, g glue.Glue, cmdName string, cfg *RestoreRawConfig) error { + defer summary.Summary(cmdName) ctx, cancel := context.WithCancel(c) defer cancel() @@ -67,8 +68,6 @@ func RunRestoreRaw(c context.Context, g glue.Glue, cmdName string, cfg *RestoreR client.EnableOnline() } - defer summary.Summary(cmdName) - u, _, backupMeta, err := ReadBackupMeta(ctx, utils.MetaFile, &cfg.Config) if err != nil { return err