Merge pull request #295 from danwinship/better-setuppod-errors

Return better errors from SetUpPod/TearDownPod

Author: dcbw

plugins/osdn/ovs/plugin.go

@@ -3,7 +3,9 @@ package ovs
 import (
 	"fmt"
 	"net"
+	"os/exec"
 	"strconv"
+	"strings"
 
 	"github.com/golang/glog"
 
@@ -14,7 +16,6 @@ import (
 	"k8s.io/kubernetes/pkg/api/resource"
 	kubeletTypes "k8s.io/kubernetes/pkg/kubelet/container"
 	knetwork "k8s.io/kubernetes/pkg/kubelet/network"
-	utilexec "k8s.io/kubernetes/pkg/util/exec"
 )
 
 type ovsPlugin struct {
@@ -175,6 +176,22 @@ func wantsMacvlan(pod *kapi.Pod) (bool, error) {
 	return false, fmt.Errorf("Pod has 'pod.network.openshift.io/assign-macvlan' annotation but is not privileged")
 }
 
+func isScriptError(err error) bool {
+	_, ok := err.(*exec.ExitError)
+	return ok
+}
+
+// Get the last command (which is prefixed with "+" because of "set -x") and its output
+func getScriptError(output []byte) string {
+	lines := strings.Split(string(output), "\n")
+	for n := len(lines) - 1; n >= 0; n-- {
+		if strings.HasPrefix(lines[n], "+") {
+			return strings.Join(lines[n:], "\n")
+		}
+	}
+	return string(output)
+}
+
 func (plugin *ovsPlugin) SetUpPod(namespace string, name string, id kubeletTypes.DockerID) error {
 	err := plugin.WaitForPodNetworkReady()
 	if err != nil {
@@ -210,16 +227,26 @@ func (plugin *ovsPlugin) SetUpPod(namespace string, name string, id kubeletTypes
 		return err
 	}
 
-	out, err := utilexec.New().Command(plugin.getExecutable(), setUpCmd, string(id), vnidstr, ingressStr, egressStr, fmt.Sprintf("%t", macvlan)).CombinedOutput()
+	out, err := exec.Command(plugin.getExecutable(), setUpCmd, string(id), vnidstr, ingressStr, egressStr, fmt.Sprintf("%t", macvlan)).CombinedOutput()
 	glog.V(5).Infof("SetUpPod network plugin output: %s, %v", string(out), err)
-	return err
+
+	if isScriptError(err) {
+		return fmt.Errorf("Error running network setup script: %s", getScriptError(out))
+	} else {
+		return err
+	}
 }
 
 func (plugin *ovsPlugin) TearDownPod(namespace string, name string, id kubeletTypes.DockerID) error {
 	// The script's teardown functionality doesn't need the VNID
-	out, err := utilexec.New().Command(plugin.getExecutable(), tearDownCmd, string(id), "-1", "-1", "-1").CombinedOutput()
+	out, err := exec.Command(plugin.getExecutable(), tearDownCmd, string(id), "-1", "-1", "-1").CombinedOutput()
 	glog.V(5).Infof("TearDownPod network plugin output: %s, %v", string(out), err)
-	return err
+
+	if isScriptError(err) {
+		return fmt.Errorf("Error running network teardown script: %s", getScriptError(out))
+	} else {
+		return err
+	}
 }
 
 func (plugin *ovsPlugin) Status(namespace string, name string, id kubeletTypes.DockerID) (*knetwork.PodNetworkStatus, error) {
@@ -232,9 +259,14 @@ func (plugin *ovsPlugin) UpdatePod(namespace string, name string, id kubeletType
 		return err
 	}
 
-	out, err := utilexec.New().Command(plugin.getExecutable(), updateCmd, string(id), vnidstr).CombinedOutput()
+	out, err := exec.Command(plugin.getExecutable(), updateCmd, string(id), vnidstr).CombinedOutput()
 	glog.V(5).Infof("UpdatePod network plugin output: %s, %v", string(out), err)
-	return err
+
+	if isScriptError(err) {
+		return fmt.Errorf("Error running network update script: %s", getScriptError(out))
+	} else {
+		return err
+	}
 }
 
 func (plugin *ovsPlugin) Event(name string, details map[string]interface{}) {