UPSTREAM: 52092: Fix resource quota controller panic (Drop in 1.8)#16241
Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom Sep 8, 2017
Merged
Conversation
The pod evaluator used by the resource quota controller made direct calls to an unsafe pod conversion function which mutates the pod argument. With multiple resource quota controller workers, concurrent processing of the same pod from a shared informer can result in a panic when the conversion code attempts to write to a map field in the pod. Swap out the direct conversion function call to Scheme.ConvertToVersion, which copies the input before conversion.
openshift-ci-robot
added
the
size/S
Contributor
|
The copy on every pod inspection is heavy, but usually beats crashing. We should probably fix the conversion function at some point instead of forcing a copy. /lgtm |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: deads2k, ironcladlou The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these OWNERS Files:You can indicate your approval by writing |
openshift-merge-robot
added
the
approved
Contributor
Author
The mutations are gone in 1.8, which is why it's safe to just drop the patch entirely during a rebase. |
Contributor
|
Automatic merge from submit-queue |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
The pod evaluator used by the resource quota controller made direct
calls to an unsafe pod conversion function which mutates the pod
argument. With multiple resource quota controller workers, concurrent
processing of the same pod from a shared informer can result in a panic
when the conversion code attempts to write to a map field in the pod.
Swap out the direct conversion function call to Scheme.ConvertToVersion,
which copies the input before conversion.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1486416
/xref kubernetes/kubernetes#52092