Revert "gc interface if it's not exist in podLister (#5789)"

This reverts commit 8886b91.

Author: oilbeater

pkg/daemon/controller.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"slices"
 	"strconv"
-	"strings"
 	"time"
 
 	nadutils "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/utils"
@@ -679,39 +678,6 @@ func (c *Controller) markAndCleanInternalPort() error {
 	return nil
 }
 
-func (c *Controller) gcInterfaces() {
-	interfacePodMap, err := ovs.ListInterfacePodMap()
-	if err != nil {
-		klog.Errorf("failed to list interface pod map: %v", err)
-		return
-	}
-	for iface, pod := range interfacePodMap {
-		parts := strings.Split(pod, "/")
-		if len(parts) < 3 {
-			klog.Errorf("malformed pod string %q for interface %s, expected format 'namespace/name/errText'", pod, iface)
-			continue
-		}
-
-		podNamespace, podName, errText := parts[0], parts[1], parts[2]
-		if strings.Contains(errText, "No such device") {
-			klog.Infof("pod %s/%s not found, delete ovs interface %s", podNamespace, podName, iface)
-			if err := ovs.CleanInterface(iface); err != nil {
-				klog.Errorf("failed to clean ovs interface %s: %v", iface, err)
-			}
-			continue
-		}
-
-		if _, err := c.podsLister.Pods(podNamespace).Get(podName); err != nil {
-			if k8serrors.IsNotFound(err) {
-				klog.Infof("pod %s/%s not found, delete ovs interface %s", podNamespace, podName, iface)
-				if err := ovs.CleanInterface(iface); err != nil {
-					klog.Errorf("failed to clean ovs interface %s: %v", iface, err)
-				}
-			}
-		}
-	}
-}
-
 // Run starts controller
 func (c *Controller) Run(stopCh <-chan struct{}) {
 	defer utilruntime.HandleCrash()
@@ -722,7 +688,7 @@ func (c *Controller) Run(stopCh <-chan struct{}) {
 	defer c.updatePodQueue.ShutDown()
 	defer c.deletePodQueue.ShutDown()
 
-	go wait.Until(c.gcInterfaces, time.Minute, stopCh)
+	go wait.Until(ovs.CleanLostInterface, time.Minute, stopCh)
 	go wait.Until(recompute, 10*time.Minute, stopCh)
 	go wait.Until(rotateLog, 1*time.Hour, stopCh)
 

pkg/ovs/ovn-nb-suite_test.go

@@ -1239,6 +1239,10 @@ func (suite *OvnClientTestSuite) Test_OvsClearPodBandwidth() {
 	suite.testOvsClearPodBandwidth()
 }
 
+func (suite *OvnClientTestSuite) Test_OvsCleanLostInterface() {
+	suite.testOvsCleanLostInterface()
+}
+
 func (suite *OvnClientTestSuite) Test_OvsCleanDuplicatePort() {
 	suite.testOvsCleanDuplicatePort()
 }

pkg/ovs/ovs-vsctl.go

@@ -228,70 +228,45 @@ func ClearPodBandwidth(podName, podNamespace, ifaceID string) error {
 	return nil
 }
 
-var lastInterfacePodMap map[string]string
-
-func ListInterfacePodMap() (map[string]string, error) {
-	output, err := Exec("--data=bare", "--format=csv", "--no-heading", "--columns=name,external_ids,error", "find",
-		"interface", "external_ids:pod_name!=[]", "external_ids:pod_namespace!=[]")
+// CleanLostInterface will clean up related ovs port, interface and qos
+// When reboot node, the ovs internal interface will be deleted.
+func CleanLostInterface() {
+	interfaceList, err := ovsFind("interface", "name,error", "ofport=-1", "external_ids:pod_netns!=[]")
 	if err != nil {
-		klog.Errorf("failed to list interface, %v", err)
-		return nil, err
-	}
-	lines := strings.Split(output, "\n")
-	result := make(map[string]string, len(lines))
-	for _, l := range lines {
-		if len(strings.TrimSpace(l)) == 0 {
-			continue
-		}
-		parts := strings.Split(strings.TrimSpace(l), ",")
-		if len(parts) != 3 {
-			continue
-		}
-		ifaceName := strings.TrimSpace(parts[0])
-		errText := strings.TrimSpace(parts[2])
-		var podNamespace, podName string
-		for externalID := range strings.FieldsSeq(parts[1]) {
-			if strings.Contains(externalID, "pod_name=") {
-				podName = strings.TrimPrefix(strings.TrimSpace(externalID), "pod_name=")
-			}
-
-			if strings.Contains(externalID, "pod_namespace=") {
-				podNamespace = strings.TrimPrefix(strings.TrimSpace(externalID), "pod_namespace=")
-			}
-		}
-		result[ifaceName] = fmt.Sprintf("%s/%s/%s", podNamespace, podName, errText)
+		klog.Errorf("failed to list failed interface %v", err)
+		return
 	}
-	if !maps.Equal(result, lastInterfacePodMap) {
-		klog.Infof("interface pod map: %v", result)
-		lastInterfacePodMap = maps.Clone(result)
+	if len(interfaceList) > 0 {
+		klog.Infof("error interfaces:\n %v", interfaceList)
 	}
-	return result, nil
-}
 
-func CleanInterface(name string) error {
-	qosList, err := ovsFind("port", "qos", "name="+name)
-	if err != nil {
-		klog.Errorf("failed to find related port %v", err)
-		return err
-	}
-	klog.Infof("delete lost port %s", name)
-	output, err := Exec("--if-exists", "--with-iface", "del-port", name)
-	if err != nil {
-		klog.Errorf("failed to delete ovs port %v, %s", err, output)
-		return err
-	}
-	for _, qos := range qosList {
-		qos = strings.TrimSpace(qos)
-		if qos != "" && qos != "[]" {
-			klog.Infof("delete lost qos %s", qos)
-			err = ovsDestroy("qos", qos)
+	for _, intf := range interfaceList {
+		name, errText := strings.Trim(strings.Split(intf, "\n")[0], "\""), strings.Split(intf, "\n")[1]
+		if strings.Contains(errText, "No such device") {
+			qosList, err := ovsFind("port", "qos", "name="+name)
 			if err != nil {
-				klog.Errorf("failed to delete qos %s, %v", qos, err)
-				return err
+				klog.Errorf("failed to find related port %v", err)
+				return
+			}
+			klog.Infof("delete lost port %s", name)
+			output, err := Exec("--if-exists", "--with-iface", "del-port", name)
+			if err != nil {
+				klog.Errorf("failed to delete ovs port %v, %s", err, output)
+				return
+			}
+			for _, qos := range qosList {
+				qos = strings.TrimSpace(qos)
+				if qos != "" && qos != "[]" {
+					klog.Infof("delete lost qos %s", qos)
+					err = ovsDestroy("qos", qos)
+					if err != nil {
+						klog.Errorf("failed to delete qos %s, %v", qos, err)
+						return
+					}
+				}
 			}
 		}
 	}
-	return nil
 }
 
 // Find and remove any existing OVS port with this iface-id. Pods can

pkg/ovs/ovs-vsctl_test.go

@@ -163,6 +163,13 @@ func (suite *OvnClientTestSuite) testOvsClearPodBandwidth() {
 	require.Error(t, err)
 }
 
+func (suite *OvnClientTestSuite) testOvsCleanLostInterface() {
+	t := suite.T()
+	t.Parallel()
+
+	CleanLostInterface()
+}
+
 func (suite *OvnClientTestSuite) testOvsCleanDuplicatePort() {
 	t := suite.T()
 	t.Parallel()