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

fix br log issue and include both 3.1 and 4.0 br in the tidb-backup-manager image (#2213) #2214

Merged
merged 2 commits into from
Apr 16, 2020
Merged

fix br log issue and include both 3.1 and 4.0 br in the tidb-backup-manager image (#2213) #2214

merged 2 commits into from
Apr 16, 2020

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented Apr 16, 2020

cherry-pick #2213 to release-1.1

…anager image

What problem does this PR solve?

  • The stderr logs from BR are missed
  • The backup-manager cannot backup or restore v3.1 TiDB Cluster

What is changed and how does it work?

  • Add the stderr logs from BR
  • Include both 3.1 and 4.0 br in the tidb-backup-manager image
  • Backup controller gets the tikv version from tc and passes it to backup-manager
  • backup-manager chooses the correct BR version to do backup and restore according to the tikv version

Check List

Tests

  • Manual test (add detailed scripts or steps below)
    • Backup and Restore for TiDB Cluster v3.1.0-rc
    • Backup and Restore for TiDB Cluster v4.0.0-rc
    • Backup and Restore for TiDB Cluster nightly

Code changes

  • Has Go code change

Related changes

  • Need to cherry-pick to the release branch

Does this PR introduce a user-facing change?:

Add stderr logs from BR to the backup-manager logs

@sre-bot sre-bot mentioned this pull request Apr 16, 2020
Merged
shuijing198799
shuijing198799 approved these changes Apr 16, 2020
View reviewed changes
Copy link
Contributor

@shuijing198799 shuijing198799 left a comment

Choose a reason for hiding this comment

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

LGTM

@DanielZhangQD
Copy link
Contributor

/merge

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 16, 2020

/run-all-tests

@sre-bot sre-bot merged commit f2934a0 into pingcap:release-1.1 Apr 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shuijing198799 shuijing198799 shuijing198799 approved these changes

@cofyc cofyc Awaiting requested review from cofyc

@LinuxGit LinuxGit Awaiting requested review from LinuxGit

@onlymellb onlymellb Awaiting requested review from onlymellb

@weekface weekface Awaiting requested review from weekface

@Yisaer Yisaer Awaiting requested review from Yisaer

Assignees
No one assigned
Labels
CanMerge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@sre-bot @DanielZhangQD @shuijing198799