Perserve device ids in in-place alloc updates #7762
Merged
+25
−5
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
added 2 commits
April 21, 2020 08:56
When an alloc is updated in-place, test that the allocated devices are preserved in new alloc struct.
When an alloc is updated in-place, ensure that the allocated device are preserved and carried over to new alloc.
[ci skip]
notnoop
commented
Apr 21, 2020
| if existing.AllocatedResources != nil { | ||
| if tr, ok := existing.AllocatedResources.Tasks[task]; ok { | ||
| networks = tr.Networks | ||
| devices = tr.Devices | ||
| } | ||
| } else if tr, ok := existing.TaskResources[task]; ok { | ||
| networks = tr.Networks |
There was a problem hiding this comment.
In 0.11, existing.AllocatedResources should always be non-nil. The type of existing.TaskResources[task].Devices is different, so I didn't bother making the compatibility path.
|
I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
When an alloc is updated in-place, ensure that any devices that are allocated to it are preserved and carried over to the new allocation struct.
I've added the test first, so one can see the failure in https://circleci.com/gh/hashicorp/nomad/60422, which is green in the follow up fix.
This builds up upon the work of @xsikor in #7697 . Thanks!
Fix #7696
Closes #7697