From 09ecce1c9ad4f34f582b90add3f5d6883ce7d349 Mon Sep 17 00:00:00 2001 From: Ti Chi Robot Date: Sat, 1 Jul 2023 00:45:43 +0800 Subject: [PATCH] br: save meta file for ebs backup earlier (#44805) (#45098) close pingcap/tidb#44806 --- br/pkg/task/backup_ebs.go | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/br/pkg/task/backup_ebs.go b/br/pkg/task/backup_ebs.go index c26085921fedc..60707dae7d730 100644 --- a/br/pkg/task/backup_ebs.go +++ b/br/pkg/task/backup_ebs.go @@ -216,6 +216,19 @@ func RunBackupEBS(c context.Context, g glue.Glue, cfg *BackupConfig) error { return errors.Trace(err) } + // Step.3 save backup meta file to s3. + // NOTE: maybe define the meta file in kvproto in the future. + // but for now json is enough. + backupInfo.SetClusterVersion(normalizedVer.String()) + backupInfo.SetFullBackupType(string(cfg.FullBackupType)) + backupInfo.SetResolvedTS(resolvedTs) + backupInfo.SetSnapshotIDs(snapIDMap) + backupInfo.SetVolumeAZs(volAZs) + err = saveMetaFile(c, backupInfo, client.GetStorage()) + if err != nil { + return err + } + if !cfg.SkipPauseGCAndScheduler { log.Info("snapshot started, restore schedule") if restoreE := restoreFunc(ctx); restoreE != nil { @@ -247,18 +260,6 @@ func RunBackupEBS(c context.Context, g glue.Glue, cfg *BackupConfig) error { } progress.Close() - // Step.3 save backup meta file to s3. - // NOTE: maybe define the meta file in kvproto in the future. - // but for now json is enough. - backupInfo.SetClusterVersion(normalizedVer.String()) - backupInfo.SetFullBackupType(string(cfg.FullBackupType)) - backupInfo.SetResolvedTS(resolvedTs) - backupInfo.SetSnapshotIDs(snapIDMap) - backupInfo.SetVolumeAZs(volAZs) - err = saveMetaFile(c, backupInfo, client.GetStorage()) - if err != nil { - return err - } finished = true return nil }