From 183b430e1c9642afa12ddecf3a1680cf0a5c116b Mon Sep 17 00:00:00 2001 From: Ti Chi Robot Date: Wed, 20 Mar 2024 21:11:13 +0800 Subject: [PATCH] log_backup: remove checking store number (#51886) (#51961) close pingcap/tidb#51957 --- br/pkg/task/restore_data.go | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/br/pkg/task/restore_data.go b/br/pkg/task/restore_data.go index 48a5a0f17c9ee..4ef705eb1f98d 100644 --- a/br/pkg/task/restore_data.go +++ b/br/pkg/task/restore_data.go @@ -13,7 +13,6 @@ import ( "github.com/pingcap/tidb/br/pkg/config" "github.com/pingcap/tidb/br/pkg/conn" "github.com/pingcap/tidb/br/pkg/conn/util" - berrors "github.com/pingcap/tidb/br/pkg/errors" "github.com/pingcap/tidb/br/pkg/glue" "github.com/pingcap/tidb/br/pkg/restore" "github.com/pingcap/tidb/br/pkg/storage" @@ -58,7 +57,7 @@ func RunResolveKvData(c context.Context, g glue.Glue, cmdName string, cfg *Resto return errors.Trace(err) } - resolveTS, numBackupStore, err := ReadBackupMetaData(ctx, externStorage) + resolveTS, numStores, err := ReadBackupMetaData(ctx, externStorage) if err != nil { return errors.Trace(err) } @@ -122,26 +121,23 @@ func RunResolveKvData(c context.Context, g glue.Glue, cmdName string, cfg *Resto if err != nil { return errors.Trace(err) } - numOnlineStore := len(allStores) - // in this version, it suppose to have the same number of tikvs between backup cluster and restore cluster - if numOnlineStore != numBackupStore { - log.Warn("the restore meta contains the number of tikvs inconsist with the resore cluster, retry ...", zap.Int("current stores", len(allStores)), zap.Int("backup stores", numBackupStore)) - return errors.Annotatef(berrors.ErrRestoreTotalKVMismatch, - "number of tikvs mismatch") - } return nil }, utils.NewPDReqBackofferExt(), ) + restoreNumStores := len(allStores) + if restoreNumStores != numStores { + log.Warn("the number of stores in the cluster has changed", zap.Int("origin", numStores), zap.Int("current", restoreNumStores)) + } if err != nil { return errors.Trace(err) } - log.Debug("total tikv", zap.Int("total", numBackupStore), zap.String("progress file", cfg.ProgressFile)) + log.Debug("total tikv", zap.Int("total", restoreNumStores), zap.String("progress file", cfg.ProgressFile)) // progress = read meta + send recovery + iterate tikv + (1 * prepareflashback + 1 * flashback) - progress := g.StartProgress(ctx, cmdName, int64(numBackupStore*3+2), !cfg.LogProgress) - go progressFileWriterRoutine(ctx, progress, int64(numBackupStore*3+2), cfg.ProgressFile) + progress := g.StartProgress(ctx, cmdName, int64(restoreNumStores*3+2), !cfg.LogProgress) + go progressFileWriterRoutine(ctx, progress, int64(restoreNumStores*3+2), cfg.ProgressFile) // restore tikv data from a snapshot volume var totalRegions int