Merge pull request #19491 from pravisankar/fix-getns

openshift-merge-robot · web-flow · commit d8a109ddfcac · 2018-04-25T08:31:22.000-07:00
SDN: In maybeAddMacvlan(), print the error returned from ns.GetNS
diff --git a/pkg/network/node/pod.go b/pkg/network/node/pod.go
@@ -389,7 +389,7 @@ func maybeAddMacvlan(pod *kapi.Pod, netns string) error {
 
 	podNs, err := ns.GetNS(netns)
 	if err != nil {
-		return fmt.Errorf("could not open netns %q", netns)
+		return fmt.Errorf("could not open netns %q: %v", netns, err)
 	}
 	defer podNs.Close()
 

Original file line number	Diff line number	Diff line change
`@@ -389,7 +389,7 @@ func maybeAddMacvlan(pod *kapi.Pod, netns string) error {`
`389`	`389`
`390`	`390`	`podNs, err := ns.GetNS(netns)`
`391`	`391`	`if err != nil {`
`392`		`- return fmt.Errorf("could not open netns %q", netns)`
	`392`	`+ return fmt.Errorf("could not open netns %q: %v", netns, err)`
`393`	`393`	`}`
`394`	`394`	`defer podNs.Close()`
`395`	`395`