status missed even if backup job succeeds (#3648) #3667
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
9 tasks
ti-srebot
requested review from
csuzhangxc,
dragonly,
handlerww and
LinuxGit
|
@DanielZhangQD please accept the invitation then you can push to the cherry-pick pull requests. |
|
/merge |
|
This pull request has been accepted and is ready to merge. Commit hash: 7a6478e
|
handlerww
approved these changes
Dec 30, 2020
|
/merge |
|
@handlerww: 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/ti-community-prow repository. |
Codecov Report
@@ Coverage Diff @@
## release-1.1 #3667 +/- ##
==============================================
Coverage ? 52.09%
==============================================
Files ? 153
Lines ? 14920
Branches ? 0
==============================================
Hits ? 7773
Misses ? 6411
Partials ? 736
Flags with carried forward coverage won't be shown. Click here to find out more. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
cherry-pick #3648 to release-1.1
What problem does this PR solve?
Fix the issue that in some cases some fields, e.g. BACKUPPATH, BACKUPSIZE, COMMITTS, etc. in the status of Backup CR or Restore CR are missed even if the backup or restore job succeed.
Fix #3635
What is changed and how does it work?
Root cause:
Take the Backup CR for example, and the Restore CR has a similar logic.
Currently, two controllers will update the status of Backup CR, one is the backup controller in the tidb-controller-manager Pod, which only updates the conditions slice in the status. The other is the controller in the backup-manager Pod which is the real backup job and will update all the fields in the status.
With the current status update logic, if something wrong with the update API call, the status updater will retrieve the latest Backup resource from the lister and replace the
statusfield totally with the old status, so if the backup-manager Pod updates all the fields in the status and then the tidb-controller-manager Pod updates the conditions slice in the status, all the other fields updated by the backup-manager will be lost.So we should update the status based on the latest status instead of the old status.
Code changes
Tests
BackupSchedulewith BRBackupCRs works as expectedBackupis updated correctly even if an error occurs during the update:BackupSchedulewith DumplingBackupCRs works as expectedBackupis updated correctly even if an error occurs during the update:Restorewith BR and the status of theRestoreis updated correctly even if an error occurs during the update:Restorewith Lightning and the status of theRestoreis updated correctly even if an error occurs during the update:Side effects
Related changes
Release Notes
Please refer to Release Notes Language Style Guide before writing the release note.