fix: for existing nic, no need to set the port type to internal (#3243)

Signed-off-by: oilbeater <liumengxinfly@gmail.com>
kubeovn · Sep 25, 2023 · 6701083 · 6701083
1 parent b183e57
commit 6701083
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 16 deletions.
diff --git a/pkg/daemon/ovs.go b/pkg/daemon/ovs.go
@@ -44,29 +44,64 @@ func pingGateway(gw, src string, verbose bool, maxRetry int) error {
 }
 
 func configureGlobalMirror(portName string, mtu int) error {
-	raw, err := ovs.Exec(ovs.MayExist, "add-port", "br-int", portName, "--",
-		"set", "interface", portName, "type=internal", "--",
-		"clear", "bridge", "br-int", "mirrors", "--",
-		"--id=@mirror0", "get", "port", portName, "--",
-		"--id=@m", "create", "mirror", fmt.Sprintf("name=%s", util.MirrorDefaultName), "select_all=true", "output_port=@mirror0", "--",
-		"add", "bridge", "br-int", "mirrors", "@m")
+	nicExist, err := linkExists(portName)
 	if err != nil {
-		klog.Errorf("failed to configure mirror nic %s %q", portName, raw)
-		return fmt.Errorf(raw)
+		return err
 	}
+
+	if !nicExist {
+		raw, err := ovs.Exec(ovs.MayExist, "add-port", "br-int", portName, "--",
+			"set", "interface", portName, "type=internal", "--",
+			"clear", "bridge", "br-int", "mirrors", "--",
+			"--id=@mirror0", "get", "port", portName, "--",
+			"--id=@m", "create", "mirror", fmt.Sprintf("name=%s", util.MirrorDefaultName), "select_all=true", "output_port=@mirror0", "--",
+			"add", "bridge", "br-int", "mirrors", "@m")
+		if err != nil {
+			klog.Errorf("failed to configure mirror nic %s %q", portName, raw)
+			return fmt.Errorf(raw)
+		}
+	} else {
+		raw, err := ovs.Exec(ovs.MayExist, "add-port", "br-int", portName, "--",
+			"clear", "bridge", "br-int", "mirrors", "--",
+			"--id=@mirror0", "get", "port", portName, "--",
+			"--id=@m", "create", "mirror", fmt.Sprintf("name=%s", util.MirrorDefaultName), "select_all=true", "output_port=@mirror0", "--",
+			"add", "bridge", "br-int", "mirrors", "@m")
+		if err != nil {
+			klog.Errorf("failed to configure mirror nic %s %q", portName, raw)
+			return fmt.Errorf(raw)
+		}
+	}
+
 	return configureMirrorLink(portName, mtu)
 }
 
 func configureEmptyMirror(portName string, mtu int) error {
-	raw, err := ovs.Exec(ovs.MayExist, "add-port", "br-int", portName, "--",
-		"set", "interface", portName, "type=internal", "--",
-		"clear", "bridge", "br-int", "mirrors", "--",
-		"--id=@mirror0", "get", "port", portName, "--",
-		"--id=@m", "create", "mirror", fmt.Sprintf("name=%s", util.MirrorDefaultName), "output_port=@mirror0", "--",
-		"add", "bridge", "br-int", "mirrors", "@m")
+	nicExist, err := linkExists(portName)
 	if err != nil {
-		klog.Errorf("failed to configure mirror nic %s %q", portName, raw)
-		return fmt.Errorf(raw)
+		return err
+	}
+
+	if !nicExist {
+		raw, err := ovs.Exec(ovs.MayExist, "add-port", "br-int", portName, "--",
+			"set", "interface", portName, "type=internal", "--",
+			"clear", "bridge", "br-int", "mirrors", "--",
+			"--id=@mirror0", "get", "port", portName, "--",
+			"--id=@m", "create", "mirror", fmt.Sprintf("name=%s", util.MirrorDefaultName), "output_port=@mirror0", "--",
+			"add", "bridge", "br-int", "mirrors", "@m")
+		if err != nil {
+			klog.Errorf("failed to configure mirror nic %s %q", portName, raw)
+			return fmt.Errorf(raw)
+		}
+	} else {
+		raw, err := ovs.Exec(ovs.MayExist, "add-port", "br-int", portName, "--",
+			"clear", "bridge", "br-int", "mirrors", "--",
+			"--id=@mirror0", "get", "port", portName, "--",
+			"--id=@m", "create", "mirror", fmt.Sprintf("name=%s", util.MirrorDefaultName), "output_port=@mirror0", "--",
+			"add", "bridge", "br-int", "mirrors", "@m")
+		if err != nil {
+			klog.Errorf("failed to configure mirror nic %s %q", portName, raw)
+			return fmt.Errorf(raw)
+		}
 	}
 	return configureMirrorLink(portName, mtu)
 }

diff --git a/pkg/daemon/ovs_linux.go b/pkg/daemon/ovs_linux.go
@@ -1167,3 +1167,14 @@ func turnOffNicTxChecksum(nicName string) (err error) {
 func getShortSharedDir(uid types.UID, volumeName string) string {
 	return filepath.Join(util.DefaultHostVhostuserBaseDir, string(uid), volumeName)
 }
+
+func linkExists(name string) (bool, error) {
+	_, err := netlink.LinkByName(name)
+	if err == nil {
+		return true, nil
+	} else if _, ok := err.(netlink.LinkNotFoundError); ok {
+		return false, nil
+	} else {
+		return false, err
+	}
+}
diff --git a/pkg/daemon/ovs_windows.go b/pkg/daemon/ovs_windows.go
@@ -333,3 +333,11 @@ func getShortSharedDir(uid types.UID, volumeName string) string {
 	// DPDK is not supported on Windows
 	return ""
 }
+
+func linkExists(name string) (bool, error) {
+	_, err := util.GetNetAdapter(name, true)
+	if err != nil {
+		return false, nil
+	}
+	return true, nil
+}