github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

supplemental logic to ensure nominatedPodMap.update() is still stateless

Browse Source
This commit is contained in:
Wei Huang 2019-05-16 23:43:26 -07:00
parent 115fe94b6f
commit 29195faa69
No known key found for this signature in database
GPG Key ID: BE5E9752F8B6E005
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/scheduler/internal/queue/scheduling_queue.go
View File

@ -774,17 +774,22 @@ func (npm *nominatedPodMap) delete(p *v1.Pod) {
func (npm *nominatedPodMap) update(oldPod, newPod *v1.Pod) {
// In some cases, an Update event with no "NominatedNode" present is received right
// after a node("NominatedNode") is reserved for this pod in memory.
// If we go updating (delete and add) it, it actually un-reserves the node since
// the newPod doesn't carry Status.NominatedNodeName.
// In this case, during this time other low-priority pods have chances to take space which
// was reserved for the nominatedPod.
if len(oldPod.Status.NominatedNodeName) == 0 && len(newPod.Status.NominatedNodeName) == 0 {
return
// In this case, we need to keep reserving the NominatedNode when updating the pod pointer.
nodeName := ""
// We won't fall into below `if` block if the Update event represents:
// (1) NominatedNode info is added
// (2) NominatedNode info is updated
// (3) NominatedNode info is removed
if NominatedNodeName(oldPod) == "" && NominatedNodeName(newPod) == "" {
if nnn, ok := npm.nominatedPodToNode[oldPod.UID]; ok {
// This is the only case we should continue reserving the NominatedNode
nodeName = nnn
}
}
// We update once the nominatedNodeName gets changed, to ensure
// We update irrespective of the nominatedNodeName changed or not, to ensure
// that pod pointer is updated.
npm.delete(oldPod)
npm.add(newPod, "")
npm.add(newPod, nodeName)
}
func (npm *nominatedPodMap) podsForNode(nodeName string) []*v1.Pod {