client: fix panic from 0.8 -> 0.10 upgrade #6605
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
makeAllocTaskServices did not do a nil check on AllocatedResources which causes a panic when upgrading directly from 0.8 to 0.10. While skipping 0.9 is not supported we intend to fix serious crashers caused by such upgrades to prevent cluster outages. I did a quick audit of the client package and everywhere else that accesses AllocatedResources appears to be properly guarded by a nil check.
schmichael
force-pushed
the
b-allocres-panic
branch
from
d75dbce
to
0fcb0d4
Compare
schmichael
commented
Nov 1, 2019
| @@ -867,6 +869,11 @@ func (c *ServiceClient) UpdateGroup(oldAlloc, newAlloc *structs.Allocation) erro | |||
| return fmt.Errorf("task group %q not in old allocation", oldAlloc.TaskGroup) | |||
| } | |||
|
|
|||
| if len(oldTG.Services) == 0 { | |||
| // No old group services, simply add new group services | |||
| return c.RegisterGroup(newAlloc) | |||
There was a problem hiding this comment.
This is necessary to prevent makeAllocTaskServices below from erroring on the old alloc due to the lack of a group network and causing the update hook to error.
nickethier
approved these changes
Nov 1, 2019
schmichael
added a commit
that referenced
this pull request
Nov 1, 2019
client: fix panic from 0.8 -> 0.10 upgrade
|
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.
makeAllocTaskServices did not do a nil check on AllocatedResources
which causes a panic when upgrading directly from 0.8 to 0.10. While
skipping 0.9 is not supported we intend to fix serious crashers caused
by such upgrades to prevent cluster outages.
I did a quick audit of the client package and everywhere else that
accesses AllocatedResources appears to be properly guarded by a nil
check.