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: proper shutdown of nfd api informers

Browse source 
Stop blocking on event channels when the api controller is stopped.
Ensures that the nfd API informer factory is properly shut down and all
resources released when stop() is called. This eliminates a memory leak
on re-configure events when leader election is enabled.

(cherry picked from commit 2bb8a72532)
This commit is contained in:
Markus Lehtonen 2024-08-20 11:32:12 +03:00
parent 77fb7be79d
commit 335b305d34
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkg/nfd-master/nfd-api-controller.go
View file

@ -187,7 +187,10 @@ func (c *nfdController) updateOneNode(typ string, obj metav1.Object) {
klog.ErrorS(err, "failed to determine node name for object", "type", typ, "object", klog.KObj(obj))
return
}
c.updateOneNodeChan <- nodeName
select {
case c.updateOneNodeChan <- nodeName:
case <-c.stopChan:
}
}
func (c *nfdController) updateAllNodes() {
@ -198,7 +201,10 @@ func (c *nfdController) updateAllNodes() {
}
func (c *nfdController) updateNodeFeatureGroup(nodeFeatureGroup string) {
c.updateNodeFeatureGroupChan <- nodeFeatureGroup
select {
case c.updateNodeFeatureGroupChan <- nodeFeatureGroup:
case <-c.stopChan:
}
}
func (c *nfdController) updateAllNodeFeatureGroups() {

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

@ -393,7 +393,7 @@ func (m *nfdMaster) Run() error {
// Update all nodes when the configuration changes
if m.nfdController != nil && nfdfeatures.NFDFeatureGate.Enabled(nfdfeatures.NodeFeatureAPI) && m.args.EnableNodeFeatureApi {
m.nfdController.updateAllNodesChan <- struct{}{}
m.nfdController.updateAllNodes()
}
case <-m.stop: