cri: check fsnotify watcher when receiving cni conf dir events

f00231050 · fuweid · commit 591caece0c9b · 2021-03-03T16:46:41.000+08:00
carry: 612f5f9 Signed-off-by: Wei Fu <fuweid89@gmail.com>
diff --git a/pkg/cri/server/cni_conf_syncer.go b/pkg/cri/server/cni_conf_syncer.go
@@ -73,7 +73,11 @@ func newCNINetConfSyncer(confDir string, netPlugin cni.CNI, loadOpts []cni.CNIOp
 func (syncer *cniNetConfSyncer) syncLoop() error {
 	for {
 		select {
-		case event := <-syncer.watcher.Events:
+		case event, ok := <-syncer.watcher.Events:
+			if !ok {
+				logrus.Debugf("cni watcher channel is closed")
+				return nil
+			}
 			// Only reload config when receiving write/rename/remove
 			// events
 			//
