github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #38780 from mikedanese/ds-fix1

Browse Source 
Automatic merge from submit-queue

daemonset: bail out after we enqueue once

This isn't terrible because we dedup in the queue but it's a waste of
cycles.
This commit is contained in:
Kubernetes Submit Queue 2016-12-15 16:15:52 -08:00 committed by GitHub
commit 7ca5f92b58
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/daemon/daemoncontroller.go
View File

@ -385,6 +385,7 @@ func (dsc *DaemonSetsController) addNode(obj interface{}) {
shouldEnqueue := dsc.nodeShouldRunDaemonPod(node, ds) shouldEnqueue := dsc.nodeShouldRunDaemonPod(node, ds)
if shouldEnqueue { if shouldEnqueue {
dsc.enqueueDaemonSet(ds) dsc.enqueueDaemonSet(ds)
return
} }
} }
} }
@ -406,6 +407,7 @@ func (dsc *DaemonSetsController) updateNode(old, cur interface{}) {
shouldEnqueue := (dsc.nodeShouldRunDaemonPod(oldNode, ds) != dsc.nodeShouldRunDaemonPod(curNode, ds)) shouldEnqueue := (dsc.nodeShouldRunDaemonPod(oldNode, ds) != dsc.nodeShouldRunDaemonPod(curNode, ds))
if shouldEnqueue { if shouldEnqueue {
dsc.enqueueDaemonSet(ds) dsc.enqueueDaemonSet(ds)
return
} }
} }
// TODO: it'd be nice to pass a hint with these enqueues, so that each ds would only examine the added node (unless it has other work to do, too). // TODO: it'd be nice to pass a hint with these enqueues, so that each ds would only examine the added node (unless it has other work to do, too).