Use patch for sts in periodicity controller #2332
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
cofyc
reviewed
Apr 29, 2020
| if err != nil { | ||
| errs = append(errs, err) | ||
| continue | ||
| } |
There was a problem hiding this comment.
why remove this? there is no need to update statefulsets not owned by tidb clusters.
| "metadata": map[string]interface{}{ | ||
| "annotations": sts.Annotations, | ||
| }, | ||
| }) |
There was a problem hiding this comment.
I think using the Patch method is a good idea. It can avoid API conflicts in kube-apiserver.
But the root cause is we should copy before modifying the statefulset if the data in the Lister are touched.
cofyc
reviewed
Apr 29, 2020
| if err != nil { | ||
| errs = append(errs, err) | ||
| continue | ||
| } | ||
| if sts.Annotations == nil { | ||
| sts.Annotations = map[string]string{} | ||
| } | ||
| sts.Annotations[label.AnnStsLastSyncTimestamp] = time.Now().Format(time.RFC3339) |
There was a problem hiding this comment.
create a new annotations map, otherwise, cache in informer will be modified.
cofyc
reviewed
Apr 29, 2020
Comment on lines
98
to
100
| if sts.Annotations == nil { | ||
| sts.Annotations = map[string]string{} | ||
| } |
There was a problem hiding this comment.
Suggested change
| if sts.Annotations == nil { | |
| sts.Annotations = map[string]string{} | |
| } |
added 2 commits
April 29, 2020 13:22
cofyc
approved these changes
Apr 29, 2020
|
cherry pick to release-1.1 in PR #2335 |
sre-bot
added a commit
that referenced
this pull request
Apr 29, 2020
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.
What problem does this PR solve?
periodicity controller use update to inject timestamp annotation for the tidbcluster sts. However, the data in the Lister might be out-of-date which causing the tikv/tidb sts scale-in again after they get scale-out by auto-scaler.
In this request, we use patch to merge the target sts annotation instead of updating.
Related changes
Does this PR introduce a user-facing change?: