From 659d9df117531069026a2c31310702d6dee5d9f0 Mon Sep 17 00:00:00 2001 From: technicianted Date: Thu, 8 Mar 2018 21:39:22 -0800 Subject: [PATCH 1/2] added missing error check --- pkg/volume/flexvolume/probe.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/volume/flexvolume/probe.go b/pkg/volume/flexvolume/probe.go index d91ad388b09..80d7a9529ba 100644 --- a/pkg/volume/flexvolume/probe.go +++ b/pkg/volume/flexvolume/probe.go @@ -176,9 +176,11 @@ func (prober *flexVolumeProber) updateProbeNeeded() { // on its parent directory. func (prober *flexVolumeProber) addWatchRecursive(filename string) error { addWatch := func(path string, info os.FileInfo, err error) error { - if info.IsDir() { - if err := prober.watcher.AddWatch(path); err != nil { - glog.Errorf("Error recursively adding watch: %v", err) + if err == nil { + if info.IsDir() { + if err := prober.watcher.AddWatch(path); err != nil { + glog.Errorf("Error recursively adding watch: %v", err) + } } } return nil From 0fb8072b1956cec112f9b961e324a21d69131d39 Mon Sep 17 00:00:00 2001 From: technicianted Date: Fri, 9 Mar 2018 21:03:22 -0800 Subject: [PATCH 2/2] reduce nesting --- pkg/volume/flexvolume/probe.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkg/volume/flexvolume/probe.go b/pkg/volume/flexvolume/probe.go index 80d7a9529ba..269ff0839ab 100644 --- a/pkg/volume/flexvolume/probe.go +++ b/pkg/volume/flexvolume/probe.go @@ -176,11 +176,9 @@ func (prober *flexVolumeProber) updateProbeNeeded() { // on its parent directory. func (prober *flexVolumeProber) addWatchRecursive(filename string) error { addWatch := func(path string, info os.FileInfo, err error) error { - if err == nil { - if info.IsDir() { - if err := prober.watcher.AddWatch(path); err != nil { - glog.Errorf("Error recursively adding watch: %v", err) - } + if err == nil && info.IsDir() { + if err := prober.watcher.AddWatch(path); err != nil { + glog.Errorf("Error recursively adding watch: %v", err) } } return nil