[JENKINS-68155] Fix state of previous labels when updating a node label #10501
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
Prior to jenkinsci#5882, trimLabels was global, so any node operation would cause all labels to be rebuilt. After jenkinsci#5882, the labels to rebuild were taken from the current state of nodes. When updating a node label however, both the old label and the new label needs to be rebuilt. When a node labels are updated, the previous values are now saved aside in order to compute the proper labels to trim.
comment-ops-bot
bot
added
the
bug
timja
approved these changes
Apr 7, 2025
jglick
reviewed
Apr 9, 2025
jglick
reviewed
Apr 9, 2025
jglick
reviewed
Apr 9, 2025
Vlatombe
commented
Apr 9, 2025
| j.jenkins.updateNode(slave); | ||
| label = Label.get("label"); | ||
| assertNotNull(label); | ||
| assertThat(label.getNodes(), empty()); |
There was a problem hiding this comment.
Expected: an empty collection
but: <[hudson.slaves.DumbSlave[node]]>
without the patch
Vlatombe
commented
Apr 9, 2025
| j.jenkins.updateNode(slave); | ||
| label = Label.get("label"); | ||
| assertNotNull(label); | ||
| assertThat(label.getNodes(), empty()); |
There was a problem hiding this comment.
Fails here without the patch
Expected: an empty collection
but: <[hudson.slaves.DumbSlave[node]]>
jglick
approved these changes
Apr 11, 2025
jglick
approved these changes
Apr 11, 2025
|
/label ready-for-merge This PR is now ready for merge, after ~24 hours, we will merge it if there's no negative feedback. |
comment-ops-bot
bot
added
the
ready-for-merge
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.
Prior to #5882,
trimLabelswas global, so any node operation would cause all labels to be rebuilt.After #5882, the labels to rebuild were taken from the current state of nodes. When updating a node label however, both the old label and the new label need to be rebuilt.
When a node labels are updated, the previous values are now saved aside in order to compute the proper labels to trim.
See JENKINS-68155.
Testing done
Proposed changelog entries
Proposed changelog category
/label bug
Proposed upgrade guidelines
N/A
Submitter checklist
@Restrictedor have@since TODOJavadocs, as appropriate.@Deprecated(since = "TODO")or@Deprecated(forRemoval = true, since = "TODO"), if applicable.evalto ease future introduction of Content Security Policy (CSP) directives (see documentation).Desired reviewers
@mention
Before the changes are marked as
ready-for-merge:Maintainer checklist
upgrade-guide-neededlabel is set and there is a Proposed upgrade guidelines section in the pull request title (see example).lts-candidateto be considered (see query).