github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #5116 from fuweid/carry-4825

Browse Source 
cri: check fsnotify watcher when receiving cni conf dir events
This commit is contained in:
Phil Estes 2021-03-03 17:26:57 -05:00 committed by GitHub
commit 2f71f4f63c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/cri/server/cni_conf_syncer.go
View File

@ -73,7 +73,11 @@ func newCNINetConfSyncer(confDir string, netPlugin cni.CNI, loadOpts []cni.CNIOp
func (syncer *cniNetConfSyncer) syncLoop() error { func (syncer *cniNetConfSyncer) syncLoop() error {
for { for {
select { 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 // Only reload config when receiving write/rename/remove
// events // events
// //