github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fsnotify: use event.Has instead of "event.Op&h == h"

Browse Source
This commit is contained in:
Paco Xu
2022-10-13 13:42:11 +08:00
parent 3fee9d2735
commit 2ce7a81169
5 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/pluginmanager/pluginwatcher/plugin_watcher.go
View File

@@ -73,12 +73,12 @@ func (w *Watcher) Start(stopCh <-chan struct{}) error {
select {
case event := <-fsWatcher.Events:
//TODO: Handle errors by taking corrective measures
if event.Op&fsnotify.Create == fsnotify.Create {
if event.Has(fsnotify.Create) {
err := w.handleCreateEvent(event)
if err != nil {
klog.ErrorS(err, "Error when handling create event", "event", event)
}
} else if event.Op&fsnotify.Remove == fsnotify.Remove {
} else if event.Has(fsnotify.Remove) {
w.handleDeleteEvent(event)
}
continue

10
pkg/volume/flexvolume/probe.go
View File

@@ -169,7 +169,7 @@ func (prober *flexVolumeProber) handleWatchEvent(event fsnotify.Event) error {
if eventPathAbs == pluginDirAbs {
// If the Flexvolume plugin directory is removed, need to recreate it
// in order to keep it under watch.
if eventOpIs(event, fsnotify.Remove) {
if event.Has(fsnotify.Remove) {
if err := prober.createPluginDir(); err != nil {
return err
}
@@ -181,7 +181,7 @@ func (prober *flexVolumeProber) handleWatchEvent(event fsnotify.Event) error {
}
// watch newly added subdirectories inside a driver directory
if eventOpIs(event, fsnotify.Create) {
if event.Has(fsnotify.Create) {
if err := prober.addWatchRecursive(eventPathAbs); err != nil {
return err
}
@@ -197,7 +197,7 @@ func (prober *flexVolumeProber) handleWatchEvent(event fsnotify.Event) error {
driverDirName := strings.Split(eventRelPathToPluginDir, string(os.PathSeparator))[0]
driverDirAbs := filepath.Join(pluginDirAbs, driverDirName)
// executable is removed, will trigger ProbeRemove event
if eventOpIs(event, fsnotify.Remove) && (eventRelPathToPluginDir == getExecutablePathRel(driverDirName) || parentPathAbs == pluginDirAbs) {
if event.Has(fsnotify.Remove) && (eventRelPathToPluginDir == getExecutablePathRel(driverDirName) || parentPathAbs == pluginDirAbs) {
prober.updateEventsMap(driverDirAbs, volume.ProbeRemove)
} else {
prober.updateEventsMap(driverDirAbs, volume.ProbeAddOrUpdate)
@@ -281,7 +281,3 @@ func (prober *flexVolumeProber) testAndSetProbeAllNeeded(newval bool) (oldval bo
oldval, prober.probeAllNeeded = prober.probeAllNeeded, newval
return
}
func eventOpIs(event fsnotify.Event, op fsnotify.Op) bool {
return event.Op&op == op
}