address comments

Signed-off-by: 5kbpers <tangminghua@pingcap.com>
pingcap · Feb 11, 2020 · 6280302 · 6280302
1 parent 985676b
commit 6280302
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pkg/restore/import.go b/pkg/restore/import.go
@@ -194,6 +194,8 @@ func (importer *FileImporter) Import(file *backup.File, rewriteRules *RewriteRul
 			err1 = importer.ingestSST(downloadMeta, info)
 			// If error is `NotLeader`, update the region info and retry
 			for err1 == errNotLeader {
+				log.Debug("ingest sst returns not leader error, retry it",
+					zap.Stringer("region", info.Region))
 				var newInfo *RegionInfo
 				newInfo, err1 = importer.metaClient.GetRegion(ctx, info.Region.GetStartKey())
 				if err1 != nil {

diff --git a/pkg/utils/retry.go b/pkg/utils/retry.go
@@ -30,8 +30,7 @@ func WithRetry(
 			select {
 			case <-ctx.Done():
 				return lastErr
-			default:
-				time.Sleep(backoffer.NextBackoff(err))
+			case <-time.After(backoffer.NextBackoff(err)):
 			}
 		} else {
 			return nil