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

Merge pull request #31406 from foxish/petset-hotloop

Browse Source 
Automatic merge from submit-queue

Petset hotlooping issue.

Part of the fix for #27634
It completely fixes it when we also get https://github.com/kubernetes/kubernetes/pull/31396 merged.
This commit is contained in:
Kubernetes Submit Queue 2016-08-26 04:00:32 -07:00 committed by GitHub
commit f0bc7d489c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/controller/petset/pet_set.go
View File

@ -73,7 +73,7 @@ type PetSetController struct {
blockingPetStore *unhealthyPetTracker
// Controllers that need to be synced.
queue *workqueue.Type
queue workqueue.RateLimitingInterface
// syncHandler handles sync events for petsets.
// Abstracted as a func to allow injection for testing.
@ -94,7 +94,7 @@ func NewPetSetController(podInformer framework.SharedIndexInformer, kubeClient *
newSyncer: func(blockingPet *pcb) *petSyncer {
return &petSyncer{pc, blockingPet}
},
queue: workqueue.New(),
queue: workqueue.NewRateLimitingQueue(workqueue.DefaultControllerRateLimiter()),
}
podInformer.AddEventHandler(framework.ResourceEventHandlerFuncs{
@ -268,7 +268,9 @@ func (psc *PetSetController) worker() {
defer psc.queue.Done(key)
if errs := psc.syncHandler(key.(string)); len(errs) != 0 {
glog.Errorf("Error syncing PetSet %v, requeuing: %v", key.(string), errs)
psc.queue.Add(key)
psc.queue.AddRateLimited(key)
} else {
psc.queue.Forget(key)
}
}()
}