github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Add better event handling for deleted Pods

Browse Source
This commit is contained in:
Bobby (Babak) Salamat 2018-01-23 12:03:35 -08:00
parent 7652c252d4
commit 79601acb2c
1 changed files with 58 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
pkg/scheduler/factory/factory.go
View File

@ -189,6 +189,13 @@ func NewConfigFactory(
switch t := obj.(type) { switch t := obj.(type) {
case *v1.Pod: case *v1.Pod:
return assignedNonTerminatedPod(t) return assignedNonTerminatedPod(t)
case cache.DeletedFinalStateUnknown:
if pod, ok := t.Obj.(*v1.Pod); ok {
return assignedNonTerminatedPod(pod)
} else {
runtime.HandleError(fmt.Errorf("unable to convert object %T to *v1.Pod in %T", obj, c))
return false
}
default: default:
runtime.HandleError(fmt.Errorf("unable to handle object in %T: %T", c, obj)) runtime.HandleError(fmt.Errorf("unable to handle object in %T: %T", c, obj))
return false return false
@ -208,36 +215,22 @@ func NewConfigFactory(
switch t := obj.(type) { switch t := obj.(type) {
case *v1.Pod: case *v1.Pod:
return unassignedNonTerminatedPod(t) return unassignedNonTerminatedPod(t)
case cache.DeletedFinalStateUnknown:
if pod, ok := t.Obj.(*v1.Pod); ok {
return unassignedNonTerminatedPod(pod)
} else {
runtime.HandleError(fmt.Errorf("unable to convert object %T to *v1.Pod in %T", obj, c))
return false
}
default: default:
runtime.HandleError(fmt.Errorf("unable to handle object in %T: %T", c, obj)) runtime.HandleError(fmt.Errorf("unable to handle object in %T: %T", c, obj))
return false return false
} }
}, },
Handler: cache.ResourceEventHandlerFuncs{ Handler: cache.ResourceEventHandlerFuncs{
AddFunc: func(obj interface{}) { AddFunc: c.addPodToSchedulingQueue,
if err := c.podQueue.Add(obj.(*v1.Pod)); err != nil { UpdateFunc: c.updatePodInSchedulingQueue,
runtime.HandleError(fmt.Errorf("unable to queue %T: %v", obj, err)) DeleteFunc: c.deletePodFromSchedulingQueue,
}
},
UpdateFunc: func(oldObj, newObj interface{}) {
pod := newObj.(*v1.Pod)
if c.skipPodUpdate(pod) {
return
}
if err := c.podQueue.Update(pod); err != nil {
runtime.HandleError(fmt.Errorf("unable to update %T: %v", newObj, err))
}
},
DeleteFunc: func(obj interface{}) {
pod := obj.(*v1.Pod)
if err := c.podQueue.Delete(pod); err != nil {
runtime.HandleError(fmt.Errorf("unable to dequeue %T: %v", obj, err))
}
if c.volumeBinder != nil {
// Volume binder only wants to keep unassigned pods
c.volumeBinder.DeletePodBindings(pod)
}
},
}, },
}, },
) )
@ -591,6 +584,47 @@ func (c *configFactory) updatePodInCache(oldObj, newObj interface{}) {
c.podQueue.AssignedPodUpdated(newPod) c.podQueue.AssignedPodUpdated(newPod)
} }
func (c *configFactory) addPodToSchedulingQueue(obj interface{}) {
if err := c.podQueue.Add(obj.(*v1.Pod)); err != nil {
runtime.HandleError(fmt.Errorf("unable to queue %T: %v", obj, err))
}
}
func (c *configFactory) updatePodInSchedulingQueue(oldObj, newObj interface{}) {
pod := newObj.(*v1.Pod)
if c.skipPodUpdate(pod) {
return
}
if err := c.podQueue.Update(pod); err != nil {
runtime.HandleError(fmt.Errorf("unable to update %T: %v", newObj, err))
}
}
func (c *configFactory) deletePodFromSchedulingQueue(obj interface{}) {
var pod *v1.Pod
switch t := obj.(type) {
case *v1.Pod:
pod = obj.(*v1.Pod)
case cache.DeletedFinalStateUnknown:
var ok bool
pod, ok = t.Obj.(*v1.Pod)
if !ok {
runtime.HandleError(fmt.Errorf("unable to convert object %T to *v1.Pod in %T", obj, c))
return
}
default:
runtime.HandleError(fmt.Errorf("unable to handle object in %T: %T", c, obj))
return
}
if err := c.podQueue.Delete(pod); err != nil {
runtime.HandleError(fmt.Errorf("unable to dequeue %T: %v", obj, err))
}
if c.volumeBinder != nil {
// Volume binder only wants to keep unassigned pods
c.volumeBinder.DeletePodBindings(pod)
}
}
func (c *configFactory) invalidateCachedPredicatesOnUpdatePod(newPod *v1.Pod, oldPod *v1.Pod) { func (c *configFactory) invalidateCachedPredicatesOnUpdatePod(newPod *v1.Pod, oldPod *v1.Pod) {
if c.enableEquivalenceClassCache { if c.enableEquivalenceClassCache {
// if the pod does not have bound node, updating equivalence cache is meaningless; // if the pod does not have bound node, updating equivalence cache is meaningless;