diff --git a/br/pkg/backup/client.go b/br/pkg/backup/client.go index 6ad03dd45cebc..a61e7b5605197 100644 --- a/br/pkg/backup/client.go +++ b/br/pkg/backup/client.go @@ -143,14 +143,14 @@ func (l *MainBackupLoop) CollectStoreBackupsAsync( cases = append(cases, reflect.SelectCase{Dir: reflect.SelectRecv, Chan: reflect.ValueOf(ch)}) } - remainingProducers := len(cases) - logutil.CL(ctx).Info("start wait store backups", zap.Int("remainingProducers", remainingProducers)) - for remainingProducers > 0 { + remainingStores := len(cases) + logutil.CL(ctx).Info("start to wait store backups", zap.Int("remainingStores", remainingStores)) + for remainingStores > 0 { chosen, value, ok := reflect.Select(cases) if !ok { // The chosen channel has been closed, so zero out the channel to disable the case cases[chosen].Chan = reflect.ValueOf(nil) - remainingProducers -= 1 + remainingStores -= 1 continue } @@ -278,7 +278,7 @@ mainLoop: } if storeBackupInfo.One != 0 { storeID := storeBackupInfo.One - logutil.CL(mainCtx).Info("receive notifaction and retry backup on this store", + logutil.CL(mainCtx).Info("receive notification and retry backup on this store", zap.Uint64("storeID", storeID), zap.Uint64("round", round)) store, err := bc.mgr.GetPDClient().GetStore(mainCtx, storeID) if err != nil { diff --git a/br/pkg/backup/store.go b/br/pkg/backup/store.go index 1f8d50e0d9598..2e0eb212f3a4d 100644 --- a/br/pkg/backup/store.go +++ b/br/pkg/backup/store.go @@ -219,7 +219,7 @@ func startBackup( retry := -1 return utils.WithRetry(ectx, func() error { retry += 1 - logutil.CL(ectx).Info("backup to store", zap.Uint64("storeID", storeID), + logutil.CL(ectx).Info("back up range to store", zap.Uint64("storeID", storeID), zap.Int("retry", retry), zap.Int("reqIndex", reqIndex)) return doSendBackup(ectx, backupCli, bkReq, func(resp *backuppb.BackupResponse) error { // Forward all responses (including error).