Merge pull request containernetworking#301 from mars1024/bugfix/ipam_…

…revert fix bug on ip revert if cmdAdd fails on macvlan and host-device
chenleji · Apr 24, 2019 · 827a4bd · 827a4bd
2 parents 6975500 + 214bcb8
commit 827a4bd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/plugins/main/host-device/host-device.go b/plugins/main/host-device/host-device.go
@@ -21,6 +21,7 @@ import (
  "fmt"
  "io/ioutil"
  "net"
+ "os"
  "path/filepath"
  "runtime"
  "strings"
@@ -96,7 +97,9 @@ func cmdAdd(args *skel.CmdArgs) error {
  // Invoke ipam del if err to avoid ip leak
  defer func() {
  if err != nil {
+ os.Setenv("CNI_COMMAND", "DEL")
  ipam.ExecDel(cfg.IPAM.Type, args.StdinData)
+ os.Setenv("CNI_COMMAND", "ADD")
  }
  }()
 

diff --git a/plugins/main/macvlan/macvlan.go b/plugins/main/macvlan/macvlan.go
@@ -19,6 +19,7 @@ import (
  "errors"
  "fmt"
  "net"
+ "os"
  "runtime"
 
  "github.com/j-keck/arping"
@@ -197,7 +198,9 @@ func cmdAdd(args *skel.CmdArgs) error {
  // Invoke ipam del if err to avoid ip leak
  defer func() {
  if err != nil {
+ os.Setenv("CNI_COMMAND", "DEL")
  ipam.ExecDel(n.IPAM.Type, args.StdinData)
+ os.Setenv("CNI_COMMAND", "ADD")
  }
  }()