rancher/norman
1
0
Fork 0
mirror of https://github.com/rancher/norman.git synced 2025-09-05 01:00:36 +00:00
Code Issues Releases Wiki Activity

Fix bug where we don't trigger handlers on second start

Browse Source
This commit is contained in:
Darren Shepherd
2018-11-19 16:37:47 -07:00
parent 1561b42e18
commit f88fcd7223
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
controller/generic_controller.go
View File

@@ -200,7 +200,7 @@ func (g *genericController) Start(ctx context.Context, threadiness int) error {
if g.running { if g.running {
for _, h := range g.handlers { for _, h := range g.handlers {
if h.generation < g.generation { if h.generation != g.generation {
continue continue
} }
for _, key := range g.informer.GetStore().ListKeys() { for _, key := range g.informer.GetStore().ListKeys() {
@@ -219,6 +219,11 @@ func (g *genericController) Start(ctx context.Context, threadiness int) error {
} }
func (g *genericController) queueObject(obj interface{}) { func (g *genericController) queueObject(obj interface{}) {
if _, ok := obj.(generationKey); ok {
g.queue.Add(obj)
return
}
key, err := cache.DeletionHandlingMetaNamespaceKeyFunc(obj) key, err := cache.DeletionHandlingMetaNamespaceKeyFunc(obj)
if err == nil { if err == nil {
g.queue.Add(key) g.queue.Add(key)
@@ -267,7 +272,11 @@ func (g *genericController) processNextWorkItem() bool {
logrus.Errorf("%v %v %v", g.name, key, err) logrus.Errorf("%v %v %v", g.name, key, err)
} }
if gk, ok := key.(generationKey); ok {
g.queue.AddRateLimited(gk.key)
} else {
g.queue.AddRateLimited(key) g.queue.AddRateLimited(key)
}
return true return true
} }