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: add error handling for group context cancel when restore file is corrupted #30190

Merged
merged 24 commits into from
Dec 20, 2021
Merged

br: add error handling for group context cancel when restore file is corrupted #30190

Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
cc5c8d5
fix issue 27015
fengou1 Sep 27, 2021
65ccd96
Merge branch 'master' into issue_27015
fengou1 Sep 27, 2021
bd531c8
fix comments - add general function isRetryableError
fengou1 Sep 28, 2021
a3b0df0
Merge branch 'issue_27015' of https://github.com/fengou1/tidb into is…
fengou1 Sep 28, 2021
c1ddff9
Merge branch 'master' into issue_27015
fengou1 Sep 28, 2021
0fbd620
remote uncessary package errors
fengou1 Sep 28, 2021
0f1976c
Merge branch 'issue_27015' of https://github.com/fengou1/tidb into is…
fengou1 Sep 28, 2021
6dcdbdb
reused the retry code from lightning
fengou1 Sep 29, 2021
fe147b9
Merge branch 'master' into issue_27015
fengou1 Sep 29, 2021
8dcda02
Merge branch 'master' into issue_27015
fengou1 Oct 7, 2021
e97b450
refactoring retryable
fengou1 Oct 7, 2021
a825bea
Merge branch 'master' into issue_27015
fengou1 Oct 9, 2021
440cdf5
Merge branch 'master' into issue_27015
fengou1 Oct 12, 2021
be50b96
rebase
fengou1 Oct 21, 2021
610beaa
Merge branch 'master' of https://github.com/pingcap/tidb
fengou1 Oct 23, 2021
296b954
add group cancel handling
fengou1 Nov 27, 2021
aaa45e2
Merge branch 'master' into issue_30135
fengou1 Nov 28, 2021
81b61f7
new method to do it
fengou1 Nov 29, 2021
91350ee
Merge branch 'issue_30135' of https://github.com/fengou1/tidb into is…
fengou1 Nov 29, 2021
b8272aa
Merge branch 'master' into issue_30135
fengou1 Nov 29, 2021
4555d5c
Merge branch 'master' into issue_30135
fengou1 Dec 17, 2021
0794b83
Merge branch 'master' into issue_30135
fengou1 Dec 18, 2021
de1eb27
Merge branch 'master' into issue_30135
ti-chi-bot Dec 19, 2021
71cd0a7
Merge branch 'master' into issue_30135
ti-chi-bot Dec 19, 2021
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
1 change: 1 addition & 0 deletions br/pkg/restore/pipeline_items.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,7 @@ func (b *tikvSender) restoreWorker(ctx context.Context, ranges <-chan drainResul
eg.Go(func() error {
e := b.client.RestoreFiles(ectx, files, r.result.RewriteRules, b.updateCh)
if e != nil {
r.done()
return e
}
log.Info("restore batch done", rtree.ZapRanges(r.result.Ranges))
Expand Down