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

flannel: remove net conf file after DEL succeed

Browse Source 
Signed-off-by: Bruce Ma <brucema19901024@gmail.com>
This commit is contained in:
Bruce Ma 2020-02-03 22:05:19 +08:00
parent f5c3d1b1ba
commit 53854dd948
3 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,12 +146,19 @@ func saveScratchNetConf(containerID, dataDir string, netconf []byte) error {
return ioutil.WriteFile(path, netconf, 0600) return ioutil.WriteFile(path, netconf, 0600)
} }
func consumeScratchNetConf(containerID, dataDir string) ([]byte, error) { func consumeScratchNetConf(containerID, dataDir string) (func(error), []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)
return ioutil.ReadFile(path) // cleanup will do clean job when no error happens in consuming/using process
cleanup := func(err error) {
if err == nil {
// Ignore errors when removing - Per spec safe to continue during DEL
_ = os.Remove(path)
}
}
netConfBytes, err := ioutil.ReadFile(path)
return cleanup, netConfBytes, err
} }
func delegateAdd(cid, dataDir string, netconf map[string]interface{}) error { func delegateAdd(cid, dataDir string, netconf map[string]interface{}) error {

13
plugins/meta/flannel/flannel_linux.go
View File

@ -68,8 +68,8 @@ func doCmdAdd(args *skel.CmdArgs, n *NetConf, fenv *subnetEnv) error {
return delegateAdd(args.ContainerID, n.DataDir, n.Delegate) return delegateAdd(args.ContainerID, n.DataDir, n.Delegate)
} }
func doCmdDel(args *skel.CmdArgs, n *NetConf) error { func doCmdDel(args *skel.CmdArgs, n *NetConf) (err error) {
netconfBytes, err := consumeScratchNetConf(args.ContainerID, n.DataDir) cleanup, netConfBytes, err := consumeScratchNetConf(args.ContainerID, n.DataDir)
if err != nil { if err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
// Per spec should ignore error if resources are missing / already removed // Per spec should ignore error if resources are missing / already removed
@ -78,10 +78,15 @@ func doCmdDel(args *skel.CmdArgs, n *NetConf) error {
return err return err
} }
// cleanup will work when no error happens
defer func() {
cleanup(err)
}()
nc := &types.NetConf{} nc := &types.NetConf{}
if err = json.Unmarshal(netconfBytes, nc); err != nil { if err = json.Unmarshal(netConfBytes, nc); err != nil {
return fmt.Errorf("failed to parse netconf: %v", err) return fmt.Errorf("failed to parse netconf: %v", err)
} }
return invoke.DelegateDel(context.TODO(), nc.Type, netconfBytes, nil) return invoke.DelegateDel(context.TODO(), nc.Type, netConfBytes, nil)
} }

13
plugins/meta/flannel/flannel_windows.go
View File

@ -55,8 +55,8 @@ func doCmdAdd(args *skel.CmdArgs, n *NetConf, fenv *subnetEnv) error {
return delegateAdd(hns.GetSandboxContainerID(args.ContainerID, args.Netns), n.DataDir, n.Delegate) return delegateAdd(hns.GetSandboxContainerID(args.ContainerID, args.Netns), n.DataDir, n.Delegate)
} }
func doCmdDel(args *skel.CmdArgs, n *NetConf) error { func doCmdDel(args *skel.CmdArgs, n *NetConf) (err error) {
netconfBytes, err := consumeScratchNetConf(hns.GetSandboxContainerID(args.ContainerID, args.Netns), n.DataDir) cleanup, netConfBytes, err := consumeScratchNetConf(hns.GetSandboxContainerID(args.ContainerID, args.Netns), n.DataDir)
if err != nil { if err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
// Per spec should ignore error if resources are missing / already removed // Per spec should ignore error if resources are missing / already removed
@ -65,10 +65,15 @@ func doCmdDel(args *skel.CmdArgs, n *NetConf) error {
return err return err
} }
// cleanup will work when no error happens
defer func() {
cleanup(err)
}()
nc := &types.NetConf{} nc := &types.NetConf{}
if err = json.Unmarshal(netconfBytes, nc); err != nil { if err = json.Unmarshal(netConfBytes, nc); err != nil {
return fmt.Errorf("failed to parse netconf: %v", err) return fmt.Errorf("failed to parse netconf: %v", err)
} }
return invoke.DelegateDel(context.TODO(), nc.Type, netconfBytes, nil) return invoke.DelegateDel(context.TODO(), nc.Type, netConfBytes, nil)
} }