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

Get rid of 30s ResyncPeriod in endpoint controller

Browse Source
This commit is contained in:
Shyam Jeedigunta 2017-06-20 14:48:57 +02:00
parent 5e8f44f195
commit 97fdc0582c
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkg/controller/endpoint/endpoints_controller.go
View File

@ -44,11 +44,6 @@ import (
) )
const ( const (
// We'll attempt to recompute EVERY service's endpoints at least this
// often. Higher numbers = lower CPU/network load; lower numbers =
// shorter amount of time before a mistaken endpoint is corrected.
FullServiceResyncPeriod = 30 * time.Second
// An annotation on the Service denoting if the endpoints controller should // An annotation on the Service denoting if the endpoints controller should
// go ahead and create endpoints for unready pods. This annotation is // go ahead and create endpoints for unready pods. This annotation is
// currently only used by StatefulSets, where we need the pod to be DNS // currently only used by StatefulSets, where we need the pod to be DNS
@ -76,17 +71,13 @@ func NewEndpointController(podInformer coreinformers.PodInformer, serviceInforme
queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "endpoint"), queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "endpoint"),
} }
serviceInformer.Informer().AddEventHandlerWithResyncPeriod( serviceInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
cache.ResourceEventHandlerFuncs{ AddFunc: e.enqueueService,
AddFunc: e.enqueueService, UpdateFunc: func(old, cur interface{}) {
UpdateFunc: func(old, cur interface{}) { e.enqueueService(cur)
e.enqueueService(cur)
},
DeleteFunc: e.enqueueService,
}, },
// TODO: Can we have much longer period here? DeleteFunc: e.enqueueService,
FullServiceResyncPeriod, })
)
e.serviceLister = serviceInformer.Lister() e.serviceLister = serviceInformer.Lister()
e.servicesSynced = serviceInformer.Informer().HasSynced e.servicesSynced = serviceInformer.Informer().HasSynced
@ -231,14 +222,19 @@ func (e *EndpointController) deletePod(obj interface{}) {
e.addPod(obj) e.addPod(obj)
return return
} }
podKey, err := keyFunc(obj) // If we reached here it means the pod was deleted but its final state is unrecorded.
if err != nil { tombstone, ok := obj.(cache.DeletedFinalStateUnknown)
utilruntime.HandleError(fmt.Errorf("Couldn't get key for object %#v: %v", obj, err)) if !ok {
utilruntime.HandleError(fmt.Errorf("Couldn't get object from tombstone %#v", obj))
return return
} }
glog.V(4).Infof("Pod %q was deleted but we don't have a record of its final state, so it will take up to %v before it will be removed from all endpoint records.", podKey, FullServiceResyncPeriod) pod, ok := tombstone.Obj.(*v1.Pod)
if !ok {
// TODO: keep a map of pods to services to handle this condition. utilruntime.HandleError(fmt.Errorf("Tombstone contained object that is not a Pod: %#v", obj))
return
}
glog.V(4).Infof("Enqueuing services of deleted pod %s having final state unrecorded", pod.Name)
e.addPod(pod)
} }
// obj could be an *v1.Service, or a DeletionFinalStateUnknown marker item. // obj could be an *v1.Service, or a DeletionFinalStateUnknown marker item.