fix for duplicate applying nodes #133
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
|
See also, rancher/rancher#32050 (comment) |
dweomer
commented
Aug 25, 2021
dweomer
commented
Aug 25, 2021
| @@ -177,7 +189,7 @@ func SelectConcurrentNodes(plan *upgradeapiv1.Plan, nodeCache corectlv1.NodeCach | |||
| } | |||
| } | |||
| sort.Slice(selected, func(i, j int) bool { | |||
| return selected[i].Name < selected[i].Name | |||
| return selected[i].Name < selected[j].Name | |||
kinarashah
approved these changes
Aug 25, 2021
brandond
approved these changes
Aug 25, 2021
Fixes rancher#132 Additionally, address a logic bug introduced in rancher#126 that could also spin out of control. See rancher@90e3d08 Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
kinarashah
approved these changes
Aug 25, 2021
dweomer
commented
Aug 25, 2021
| } | ||
| obj.Status.Applying = concurrentNodeNames[:] |
There was a problem hiding this comment.
The sort issue was spurious, this was where the dupes were coming from all along.
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.
Make duplicate entries for .status.applying on plans magically disappear
by correctly sorting the return value for SelectConcurrentNodes.
Fixes #132
Additionally, address a logic bug introduced in #126 that could also
spin out of control.
See
90e3d08
Signed-off-by: Jacob Blain Christen jacob@rancher.com