Bug 1862700: Fix ovnkube-node aggressive memory allocation to prevent memory bloating

go-controller/pkg/cni/helper_linux.go

@@ -332,14 +332,7 @@ func (pr *PodRequest) ConfigureInterface(namespace string, podName string, ifInf
 		klog.Warningf("failed to settle addresses: %q", err)
 	}
 
-	err = wait.PollImmediate(100*time.Millisecond, 20*time.Second, func() (bool, error) {
-		stdout, err := ofctlExec("dump-flows", "br-int")
-		if err != nil {
-			return false, nil
-		}
-		return strings.Contains(stdout, ifInfo.IPs[0].IP.String()), nil
-	})
-	if err != nil {
+	if err = waitForPodFlows(ifInfo.MAC.String()); err != nil {
 		return nil, fmt.Errorf("timed out dumping br-int flow entries for sandbox: %v", err)
 	}
 
@@ -373,6 +366,26 @@ func (pr *PodRequest) deletePodConntrack() {
 	}
 }
 
+// OCP HACK: wait for OVN to fully process the new pod
+func waitForPodFlows(mac string) error {
+
+	return wait.PollImmediate(200*time.Millisecond, 20*time.Second, func() (bool, error) {
+		// Query the flows by mac address
+		query := fmt.Sprintf("table=9,dl_src=%s",mac)
+		// ovs-ofctl dumps error on stderr, so stdout will only dump flow data if matches the query.
+		stdout, err := ofctlExec("dump-flows", "br-int", query)
+		if err != nil {
+			return false, nil
+		}
+		if len(stdout) == 0 {
+			return false, nil
+		}
+		return true, nil
+	})
+}
+
+// END OCP HACK
+
 // PlatformSpecificCleanup deletes the OVS port
 func (pr *PodRequest) PlatformSpecificCleanup() error {
 	ifaceName := pr.SandboxID[:15]

go-controller/pkg/cni/ovs.go

@@ -1,7 +1,9 @@
 package cni
 
 import (
+	"bytes"
 	"fmt"
+	"k8s.io/klog"
 	"strings"
 
 	kexec "k8s.io/utils/exec"
@@ -18,20 +20,33 @@ func setExec(r kexec.Interface) error {
 }
 
 func ofctlExec(args ...string) (string, error) {
-	args = append([]string{"--timeout=30"}, args...)
-	output, err := runner.Command("ovs-ofctl", args...).CombinedOutput()
+
+	args = append([]string{"--timeout=30","--no-stats", "--strict"}, args...)
+	var stdout, stderr bytes.Buffer
+	cmd := runner.Command("ovs-ofctl", args...)
+	cmd.SetStdout(&stdout)
+	cmd.SetStderr(&stderr)
+
+	cmdStr := strings.Join(args, " ")
+	klog.V(5).Infof("exec: ovs-ofctl %s", cmdStr)
+
+	err := cmd.Run()
+
 	if err != nil {
-		return "", fmt.Errorf("failed to run 'ovs-ofctl %s': %v\n  %q", strings.Join(args, " "), err, string(output))
+		stderrStr := string(stderr.Bytes())
+		klog.Errorf("exec: ovs-ofctl %s: stderr: %q", cmdStr, stderrStr)
+		return "", fmt.Errorf("failed to run 'ovs-ofctl %s': %v\n  %q", cmdStr, err, stderrStr)
 	}
+	stdoutStr := string(stdout.Bytes())
+	klog.V(5).Infof("exec: ovs-ofctl %s: stdout: %q",cmdStr, stdoutStr)
 
-	outStr := string(output)
-	trimmed := strings.TrimSpace(outStr)
+	trimmed := strings.TrimSpace(stdoutStr)
 	// If output is a single line, strip the trailing newline
 	if strings.Count(trimmed, "\n") == 0 {
-		outStr = trimmed
+		stdoutStr = trimmed
 	}
 
-	return outStr, nil
+	return stdoutStr, nil
 }
 
 func ovsExec(args ...string) (string, error) {