mirrors/node-feature-discovery
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/node-feature-discovery.git synced 2024-12-14 11:57:51 +00:00
Code Activity

nfd-master: protect node updater pool queueing with a lock

Browse source 
Prevents races when (re-)starting the queue. There are no reports on
issues related to this (and I haven't come up with any actual failure
path in the current code) but better to be safe and follow the best
practices.
This commit is contained in:
Markus Lehtonen 2024-03-27 16:47:15 +02:00
parent 137f18b5b3
commit bce446c5b6
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/nfd-master/nfd-master.go
View file

@ -442,7 +442,7 @@ func (m *nfdMaster) nfdAPIUpdateHandler() {
} }
} else { } else {
for nodeName := range updateNodes { for nodeName := range updateNodes {
m.nodeUpdaterPool.queue.Add(nodeName) m.nodeUpdaterPool.addNode(nodeName)
} }
} }
@ -710,7 +710,7 @@ func (m *nfdMaster) nfdAPIUpdateAllNodes() error {
} }
for _, node := range nodes.Items { for _, node := range nodes.Items {
m.nodeUpdaterPool.queue.Add(node.Name) m.nodeUpdaterPool.addNode(node.Name)
} }
return nil return nil

8
pkg/nfd-master/node-updater-pool.go
View file

@ -28,7 +28,7 @@ import (
type nodeUpdaterPool struct { type nodeUpdaterPool struct {
queue workqueue.RateLimitingInterface queue workqueue.RateLimitingInterface
sync.Mutex sync.RWMutex
wg sync.WaitGroup wg sync.WaitGroup
nfdMaster *nfdMaster nfdMaster *nfdMaster
@ -114,3 +114,9 @@ func (u *nodeUpdaterPool) stop() {
u.queue.ShutDown() u.queue.ShutDown()
u.wg.Wait() u.wg.Wait()
} }
func (u *nodeUpdaterPool) addNode(nodeName string) {
u.RLock()
defer u.RUnlock()
u.queue.Add(nodeName)
}