Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 7 commits into from
Jun 17, 2022
Merged

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

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
51f2eb4
cherry pick #33313 to release-5.3
YuJuncen Mar 23, 2022
e208ede
Merge branch 'release-5.3' into release-5.3-e2ad790a2979
3pointer Jun 14, 2022
a142ba2
Merge branch 'release-5.3' into release-5.3-e2ad790a2979
3pointer Jun 17, 2022
d3c1758
resolve conflict
3pointer Jun 17, 2022
281f9c4
Merge branch 'release-5.3' into release-5.3-e2ad790a2979
ti-chi-bot Jun 17, 2022
abb6e41
Merge branch 'release-5.3' into release-5.3-e2ad790a2979
ti-chi-bot Jun 17, 2022
4d55aa6
Merge branch 'release-5.3' into release-5.3-e2ad790a2979
ti-chi-bot Jun 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions br/pkg/restore/split_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,12 +471,17 @@ func (s *testRangeSuite) testNeedSplit(c *C, isRawKv bool) {
}

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()
}
Expand All @@ -491,6 +496,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()
}
Expand Down