vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

ocicni: Handle create and write events

Browse source 
By only handling create events, we are breaking plugins that don't
create and write atomically, like weave for example.
The Weave plugin creates the file first and later write to it. We are
missing the second part and never see the final CNI config file.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz 2017-06-09 10:19:26 +02:00
parent 8441dca284
commit b480336dd7
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkg/ocicni/ocicni.go
View file

@ -48,7 +48,8 @@ func (plugin *cniNetworkPlugin) monitorNetDir() {
select { select {
case event := <-watcher.Events: case event := <-watcher.Events:
logrus.Debugf("CNI monitoring event %v", event) logrus.Debugf("CNI monitoring event %v", event)
if event.Op&fsnotify.Create != fsnotify.Create { if event.Op&fsnotify.Create != fsnotify.Create &&
event.Op&fsnotify.Write != fsnotify.Write {
continue continue
} }