Merge pull request #15 from feiskyer/destroyOVSInterface

Refactor destroyOVSInterface to avoid failing

Author: resouer

pkg/exec/exec.go

@@ -47,9 +47,9 @@ func RunCommand(cmd string, args ...string) ([]string, error) {
 		return nil, err
 	}
 
-	output, err := command.Output()
+	output, err := command.CombinedOutput()
 	if err != nil {
-		return nil, err
+		return []string{string(output)}, err
 	}
 	return strings.Split(strings.TrimSpace(string(output)), "\n"), nil
 }

pkg/kubestack/kubestack.go

@@ -43,9 +43,10 @@ func NewKubeHandler(driver *common.OpenStack) *KubeHandler {
 }
 
 func (h *KubeHandler) Serve(addr string) error {
+	glog.V(1).Infof("Starting kubestack at %s", addr)
 	l, err := net.Listen("tcp", addr)
 	if err != nil {
-		glog.Fatal("Failed to listen: %s", addr)
+		glog.Fatalf("Failed to listen: %s", addr)
 		return err
 	}
 	return h.server.Serve(l)

pkg/plugins/openvswitch/openvswitch.go

@@ -351,34 +351,45 @@ func (p *OVSPlugin) SetupInterface(podName, podInfraContainerID string, port *po
 	return nil
 }
 
-func (p *OVSPlugin) destroyOVSInterface(podName, podInfraContainerID string, port *ports.Port) error {
-	_, qvo := p.buildVethName(port.ID)
-	_, err := exec.RunCommand("ip", "link", "delete", qvo)
+func (p *OVSPlugin) destroyOVSInterface(podName, podInfraContainerID, portID string) error {
+	qvb, qvo := p.buildVethName(portID)
+	bridge := p.buildBridgeName(portID)
+
+	output, err := exec.RunCommand("brctl", "delif", bridge, qvb)
 	if err != nil {
-		glog.V(5).Infof("Warning: DestroyInterface failed: %v", err)
+		glog.Warningf("Warning: brctl delif %s failed: %v, %v", qvb, output, err)
 	}
 
-	_, err = exec.RunCommand("ovs-vsctl", "-vconsole:off", "--if-exists", "del-port", qvo)
+	output, err = exec.RunCommand("ip", "link", "set", "dev", bridge, "down")
 	if err != nil {
-		glog.V(5).Infof("Warning: DestroyInterface failed: %v", err)
+		glog.Warningf("Warning: set bridge %s down failed: %v, %v", bridge, output, err)
 	}
 
-	bridge := p.buildBridgeName(port.ID)
-	_, err = exec.RunCommand("ip", "link", "set", bridge, "down")
+	output, err = exec.RunCommand("brctl", "delbr", bridge)
 	if err != nil {
-		glog.V(5).Infof("Warning: DestroyInterface failed: %v", err)
+		glog.Warningf("Warning: delete bridge %s failed: %v, %v", bridge, output, err)
 	}
 
-	_, err = exec.RunCommand("brctl", "delbr", bridge)
+	output, err = exec.RunCommand("ovs-vsctl", "-vconsole:off", "--if-exists", "del-port", qvo)
 	if err != nil {
-		glog.V(5).Infof("Warning: DestroyInterface failed: %v", err)
+		glog.Warningf("Warning: ovs del-port %s failed: %v, %v", qvo, output, err)
+	}
+
+	output, err = exec.RunCommand("ip", "link", "set", "dev", qvo, "down")
+	if err != nil {
+		glog.Warningf("Warning: set dev %s down failed: %v, %v", qvo, output, err)
+	}
+
+	output, err = exec.RunCommand("ip", "link", "delete", "dev", qvo)
+	if err != nil {
+		glog.Warningf("Warning: delete dev %s failed: %v, %v", qvo, output, err)
 	}
 
 	return nil
 }
 
-func (p *OVSPlugin) destroyDockerInterface(podName, podInfraContainerID string, port *ports.Port) error {
-	tapName, _ := p.buildTapName(port.ID)
+func (p *OVSPlugin) destroyDockerInterface(podName, podInfraContainerID, portID string) error {
+	tapName, _ := p.buildTapName(portID)
 	_, err := exec.RunCommand("ip", "link", "delete", tapName)
 	if err != nil {
 		glog.V(5).Infof("Warning: DestroyInterface failed: %v", err)
@@ -401,11 +412,11 @@ func (p *OVSPlugin) destroyDockerInterface(podName, podInfraContainerID string,
 }
 
 func (p *OVSPlugin) DestroyInterface(podName, podInfraContainerID string, port *ports.Port, containerRuntime string) error {
-	p.destroyOVSInterface(podName, podInfraContainerID, port)
+	p.destroyOVSInterface(podName, podInfraContainerID, port.ID)
 
 	switch containerRuntime {
 	case runtimeTypeDocker:
-		p.destroyDockerInterface(podName, podInfraContainerID, port)
+		p.destroyDockerInterface(podName, podInfraContainerID, port.ID)
 	default:
 		glog.V(4).Infof("DestroyInterface for %s done", containerRuntime)
 	}