ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

Merge pull request #407 from aaronlevy/del-err

Browse Source 
plugins/meta/flannel: If net config is missing do not return err on DEL
This commit is contained in:
Tom Denham 2017-03-21 10:43:40 -07:00 committed by GitHub
commit 699380d687
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/meta/flannel/flannel.go
View File

@ -142,6 +142,7 @@ func saveScratchNetConf(containerID, dataDir string, netconf []byte) error {
func consumeScratchNetConf(containerID, dataDir string) ([]byte, error) { func consumeScratchNetConf(containerID, dataDir string) ([]byte, error) {
path := filepath.Join(dataDir, containerID) path := filepath.Join(dataDir, containerID)
// Ignore errors when removing - Per spec safe to continue during DEL
defer os.Remove(path) defer os.Remove(path)
return ioutil.ReadFile(path) return ioutil.ReadFile(path)
@ -245,6 +246,10 @@ func cmdDel(args *skel.CmdArgs) error {
netconfBytes, err := consumeScratchNetConf(args.ContainerID, nc.DataDir) netconfBytes, err := consumeScratchNetConf(args.ContainerID, nc.DataDir)
if err != nil { if err != nil {
if os.IsNotExist(err) {
// Per spec should ignore error if resources are missing / already removed
return nil
}
return err return err
} }

8
plugins/meta/flannel/flannel_test.go
View File

@ -140,6 +140,14 @@ FLANNEL_IPMASQ=true
By("check that plugin removes net config from state dir") By("check that plugin removes net config from state dir")
Expect(path).ShouldNot(BeAnExistingFile()) Expect(path).ShouldNot(BeAnExistingFile())
By("calling DEL again")
err = testutils.CmdDelWithResult(targetNs.Path(), IFNAME, func() error {
return cmdDel(args)
})
By("check that plugin does not fail due to missing net config")
Expect(err).NotTo(HaveOccurred())
return nil return nil
}) })
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())