br: fix race in test Test(Split|Restore)Failed (pingcap#33313)

close pingcap#33310
ti-srebot · Mar 25, 2022 · 4cf121d · 4cf121d
1 parent eacba78
commit 4cf121d
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/br/pkg/restore/split_test.go b/br/pkg/restore/split_test.go
@@ -567,12 +567,17 @@ func TestRegionConsistency(t *testing.T) {
 }
 
 type fakeRestorer struct {
+	mu sync.Mutex
+
 	errorInSplit  bool
 	splitRanges   []rtree.Range
 	restoredFiles []*backuppb.File
 }
 
 func (f *fakeRestorer) SplitRanges(ctx context.Context, ranges []rtree.Range, rewriteRules *restore.RewriteRules, updateCh glue.Progress, isRawKv bool) error {
+	f.mu.Lock()
+	defer f.mu.Unlock()
+
 	if ctx.Err() != nil {
 		return ctx.Err()
 	}
@@ -587,6 +592,9 @@ func (f *fakeRestorer) SplitRanges(ctx context.Context, ranges []rtree.Range, re
 }
 
 func (f *fakeRestorer) RestoreFiles(ctx context.Context, files []*backuppb.File, rewriteRules *restore.RewriteRules, updateCh glue.Progress) error {
+	f.mu.Lock()
+	defer f.mu.Unlock()
+
 	if ctx.Err() != nil {
 		return ctx.Err()
 	}