Merge pull request #32 from Random-Liu/ignore-error-for-empty-path

abhi · web-flow · commit 40bcf8ec8acd · 2018-10-11T07:25:37.000-07:00
Only ignore "no such file or directory" error for empty path
diff --git a/cni.go b/cni.go
@@ -127,7 +127,16 @@ func (c *libcni) Remove(id string, path string, opts ...NamespaceOpts) error {
 		return err
 	}
 	for _, network := range c.networks {
-		if err := network.Remove(ns); err != nil && !strings.Contains(err.Error(), "no such file or directory") {
+		if err := network.Remove(ns); err != nil {
+			// Based on CNI spec v0.7.0, empty network namespace is allowed to
+			// do best effort cleanup. However, it is not handled consistently
+			// right now:
+			// https://github.com/containernetworking/plugins/issues/210
+			// TODO(random-liu): Remove the error handling when the issue is
+			// fixed and the CNI spec v0.6.0 support is deprecated.
+			if path == "" && strings.Contains(err.Error(), "no such file or directory") {
+				continue
+			}
 			return err
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,16 @@ func (c *libcni) Remove(id string, path string, opts ...NamespaceOpts) error {`
`127`	`127`	`return err`
`128`	`128`	`}`
`129`	`129`	`for _, network := range c.networks {`
`130`		`- if err := network.Remove(ns); err != nil && !strings.Contains(err.Error(), "no such file or directory") {`
	`130`	`+ if err := network.Remove(ns); err != nil {`
	`131`	`+ // Based on CNI spec v0.7.0, empty network namespace is allowed to`
	`132`	`+ // do best effort cleanup. However, it is not handled consistently`
	`133`	`+ // right now:`
	`134`	`+ // https://github.com/containernetworking/plugins/issues/210`
	`135`	`+ // TODO(random-liu): Remove the error handling when the issue is`
	`136`	`+ // fixed and the CNI spec v0.6.0 support is deprecated.`
	`137`	`+ if path == "" && strings.Contains(err.Error(), "no such file or directory") {`
	`138`	`+ continue`
	`139`	`+ }`
`131`	`140`	`return err`
`132`	`141`	`}`
`133`	`142`	`}`