From 591caece0c9b3fd6a08576b31df6d13e0ae38501 Mon Sep 17 00:00:00 2001 From: f00231050 Date: Thu, 10 Dec 2020 10:05:07 +0800 Subject: [PATCH] cri: check fsnotify watcher when receiving cni conf dir events carry: https://github.com/containerd/containerd/pull/4825/commits/612f5f9f44927a558ee3e35b7c7233baf39169e8 Signed-off-by: Wei Fu --- pkg/cri/server/cni_conf_syncer.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/cri/server/cni_conf_syncer.go b/pkg/cri/server/cni_conf_syncer.go index 03131a9be..1859d1cc4 100644 --- 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 //