Cleanup TopologyManager and update policy.Merge() #87758
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
k8s-ci-robot
added
release-note-none
k8s-ci-robot
added
the
approved
k8s-ci-robot
added
area/kubelet
sig/node
klueska
force-pushed
the
upstream-cleanup-topology-manager
branch
from
fedea90
to
31fcce5
Compare
|
/assign @nolancon |
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
/retest |
ipuustin
reviewed
Feb 3, 2020
| delete(m.podMap, containerID) | ||
| klog.Infof("[topologymanager] RemoveContainer - Container ID: %v podTopologyHints: %v", containerID, m.podTopologyHints) | ||
| delete(m.podTopologyHints[podUIDString], containerID) |
There was a problem hiding this comment.
The old implementation allowed RemoveContainer to be called even when the m.podTopologyHints[podUIDString] didn't exist. Should we check here for existence before delete?
|
Yes. We should always check for that. That was an oversight on my part. |
|
/hold |
k8s-ci-robot
added
the
do-not-merge/hold
klueska
force-pushed
the
upstream-cleanup-topology-manager
branch
from
31fcce5
to
f7f3b89
Compare
k8s-ci-robot
removed
lgtm
|
/hold cancel |
k8s-ci-robot
removed
the
do-not-merge/hold
Previously, we unconditionally removed *all* topology hints from a pod whenever just one container was being removed. This commit makes it so we only remove the hints for the single container being removed, and then conditionally remove the pod from the podTopologyHints[podUID] when no containers left in it.
Previously, the verious Merge() policies of the TopologyManager all eturned their own lifecycle.PodAdmitResult result. However, for consistency in any failed admits, this is better handled in the top-level Topology manager, with each policy only returning a boolean about whether or not they would like to admit the pod or not. This commit changes the semantics to match this logic.
Previously, this function was taking full Pod and Container objects unnecessarily. This commit updates this so that they will take pointers instead.
klueska
force-pushed
the
upstream-cleanup-topology-manager
branch
from
f7f3b89
to
d5addb4
Compare
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: klueska The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
approved
|
/lgtm |
k8s-ci-robot
added
the
lgtm
11 tasks
6 tasks
|
/test pull-kubernetes-e2e-kind-ipv6 |
|
/test pull-kubernetes-e2e-gce |
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.
What type of PR is this?
/kind cleanup
What this PR does / why we need it:
This PR cleans up the logic in the TopologyManager pod Admit hander. As part of this, it simplifies the interface for its underlying policy.Merge() calls.
It is best reviewed commit-by-commit.
Does this PR introduce a user-facing change?: