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.

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

backup: allow backup tolerate minor TiKV failure (#997) (#1019) #1062

Merged
merged 7 commits into from May 13, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Apr 26, 2021

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:

git push git@github.com:ti-srebot/br.git pr/1062:release-4.0-264059b76873

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:

git push git@github.com:ti-srebot/br.git pr/1019:release-5.0-db863d52a070

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

  • Integration test

Release Note

  • BR now can tolerate minor TiKV disconnection.

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@@ -600,6 +600,30 @@ func (bc *Client) fineGrainedBackup(
rangeTree rtree.RangeTree,
updateCh glue.Progress,
) error {
<<<<<<< HEAD
=======
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merge conflict

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

resolved.

@YuJuncen
Copy link
Collaborator

Maybe we also need to cherry-pick #1037?

@3pointer 3pointer added this to the v4.0.13 milestone May 11, 2021
@zhouqiang-cl
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

@zhouqiang-cl: /merge is only allowed for the committers in list.

In response to this:

/merge

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.

@3pointer
Copy link
Collaborator

/lgtm

@ti-chi-bot ti-chi-bot added the status/LGT1 LGTM1 label May 12, 2021
@3pointer
Copy link
Collaborator

/run-integration-tests

3 similar comments
@YuJuncen
Copy link
Collaborator

/run-integration-tests

@3pointer
Copy link
Collaborator

/run-integration-tests

@3pointer
Copy link
Collaborator

/run-integration-tests

@overvenus
Copy link
Member

/lgtm

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • 3pointer
  • overvenus

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-chi-bot ti-chi-bot added status/LGT2 LGTM2 and removed status/LGT1 LGTM1 labels May 13, 2021
@overvenus
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 8c6631f

@ti-chi-bot ti-chi-bot merged commit 7f61247 into pingcap:release-4.0 May 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants