-
Notifications
You must be signed in to change notification settings - Fork 102
backup: allow backup tolerate minor TiKV failure (#997) (#1019) #1062
backup: allow backup tolerate minor TiKV failure (#997) (#1019) #1062
Conversation
Signed-off-by: ti-srebot <[email protected]>
pkg/backup/client.go
Outdated
@@ -600,6 +600,30 @@ func (bc *Client) fineGrainedBackup( | |||
rangeTree rtree.RangeTree, | |||
updateCh glue.Progress, | |||
) error { | |||
<<<<<<< HEAD | |||
======= |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merge conflict
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
resolved.
Maybe we also need to cherry-pick #1037? |
/merge |
@zhouqiang-cl: In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository. |
/lgtm |
/run-integration-tests |
3 similar comments
/run-integration-tests |
/run-integration-tests |
/run-integration-tests |
/lgtm |
[REVIEW NOTIFICATION] This pull request has been approved by:
To complete the pull request process, please ask the reviewers in the list to review by filling The full list of commands accepted by this bot can be found here. Reviewer can indicate their review by writing |
/merge |
This pull request has been accepted and is ready to merge. Commit hash: 8c6631f
|
cherry-pick #1019 to release-4.0
You can switch your code base to this Pull Request by using git-extras:
# In br repo: git pr https://github.com/pingcap/br/pull/1062
After apply modifications, you can push your change to this PR via:
cherry-pick #997 to release-5.0
You can switch your code base to this Pull Request by using git-extras:
# In br repo: git pr https://github.com/pingcap/br/pull/1019
After apply modifications, you can push your change to this PR via:
What problem does this PR solve?
fixed #980
What is changed and how it works?
ignore all ‘failed to connect to store’ errors during backup.
Check List
Tests
Release Note