nfd-worker: Watch features.d changes #2156
Conversation
k8s-ci-robot
added
the
cncf-cla: yes
✅ Deploy Preview for kubernetes-sigs-nfd ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: ozhuraki The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
needs-ok-to-test
|
Hi @ozhuraki. Thanks for your PR. I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
k8s-ci-robot
added
the
size/M
There was a problem hiding this comment.
Thanks @ozhuraki for taking a stab at this.
I think we should refactor the code and re-architecture this more to make the code more maintainable. There might be other sources we'd also make react to events in a similar way. Basically, it should be the source (source/local in this case) which should be able to notify the main event loop that features have been updated. Also, no need to run re-discovery of all features.
|
Thanks, makes sense. I will move this into source/local. |
Signed-off-by: Oleg Zhurakivskyy <[email protected]>
|
Moved into source/local, please take a look |
There was a problem hiding this comment.
Pull Request Overview
Adds file system watching for changes under the features.d directory so that nfd-worker can re-run feature discovery on create/write/remove/rename/chmod events.
- Introduces a global
FSWatcherandwatch()function inlocal.goto set up anfsnotifywatcher. - Switches the
localsource import to non-blank innfd-worker.goand hooks itsFSWatcherinto the worker'sRun()loop. - Adds new struct fields for the watcher in
nfd-worker.go.
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| source/local/local.go | Add fsnotify import, global FSWatcher, and watch() setup logic |
| pkg/nfd-worker/nfd-worker.go | Import local package, add watcher fields, and handle fsnotify events in the run loop |
Comments suppressed due to low confidence (2)
source/local/local.go:67
- Exporting
FSWatcheras a global var makes it part of the package API unintentionally. Consider making it unexported (fsWatcher) or encapsulating it within yourlocalSourcestruct.
FSWatcher *fsnotify.Watcher
source/local/local.go:131
- The new watcher initialization logic in
Discover()isn’t covered by tests. Consider adding a unit or integration test to verify thatwatch()is called and thatFSWatcheris set.
if FSWatcher == nil {
| @@ -318,6 +327,30 @@ func getFileContent(fileName string) ([][]byte, error) { | |||
| return lines, nil | |||
| } | |||
|
|
|||
| func watch(s *localSource) error { | |||
There was a problem hiding this comment.
The parameter s is never used in watch(). Remove it to avoid unused-parameter warnings and clarify the function's intent.
| func watch(s *localSource) error { | |
| func watch() error { |
Copilot uses AI. Check for mistakes.
| @@ -121,6 +122,8 @@ type nfdWorker struct { | |||
| k8sClient k8sclient.Interface | |||
| nfdClient nfdclient.Interface | |||
| stop chan struct{} // channel for signaling stop | |||
| fsEvent chan fsnotify.Event | |||
There was a problem hiding this comment.
The struct field fsEvent is declared but never used. Remove it or wire it into the select loop to avoid dead code.
Copilot uses AI. Check for mistakes.
| @@ -341,6 +351,13 @@ func (w *nfdWorker) Run() error { | |||
| return err | |||
| } | |||
|
|
|||
| case event := <-w.fsWatcher.Events: | |||
There was a problem hiding this comment.
Errors from the watcher (w.fsWatcher.Errors) are not handled. It's recommended to add a case to log or handle w.fsWatcher.Errors to avoid silent failures.
Copilot uses AI. Check for mistakes.
Closes: #2075