fix data race in node upsert #24127
Merged
fix data race in node upsert #24127
+7
−4
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
tgross
added
backport/ent/1.7.x+ent
tgross
commented
Oct 3, 2024
nomad/structs/structs.go
Outdated
Comment on lines
3265
to
3266
| // COMPAT remove in 1.9+ | ||
| // apply compatibility fixups covering node topology |
There was a problem hiding this comment.
@shoenig: is this instead safe to simply remove in 1.9 as suggested by this comment? It looks like we introduced this in 1.6.x. We'll need to be safe for folks to upgrade from 1.6.x to 1.9 but not earlier than that.
We introduced this in 1.7. We should hold off removing until 1.10 LTS. I've updated the associated comments in this PR.
While testing with agents built with the race-detection option enabled, I encountered a data race while draining a node. When we upsert a node we copy the `NodeResources` struct and then perform a fixup for backwards compatibility of the topology struct. This fixup was being executed on the original struct and not the copy, which means we're uselessly fixing up the wrong struct and we're corrupting the state store in the process (albeit harmlessly, I suspect). Fix the data race by calling the method on the correct pointer.
tgross
force-pushed
the
data-race-node-resources-compat
branch
from
1a2d2c8
to
4ccc1b5
Compare
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.
While testing with agents built with the race-detection option enabled, I encountered a data race while draining a node.
When we upsert a node we copy the
NodeResourcesstruct and then perform a fixup for backwards compatibility of the topology struct. This fixup was being executed on the original struct and not the copy, which means we're uselessly fixing up the wrong struct and we're corrupting the state store in the process (albeit harmlessly, I suspect).Fix the data race by calling the method on the correct pointer.