add compact for release-1.12 (#3342)

kubeovn · Oct 26, 2023 · 31e77fb · 31e77fb
1 parent d771eb8
commit 31e77fb
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 3 deletions.
diff --git a/charts/templates/central-deploy.yaml b/charts/templates/central-deploy.yaml
@@ -78,6 +78,8 @@ spec:
               value: "{{ .Values.networking.OVN_LEADER_PROBE_INTERVAL }}"
             - name: OVN_NORTHD_N_THREADS
               value: "{{ .Values.networking.OVN_NORTHD_N_THREADS }}"
+            - name: ENABLE_COMPACT
+              value: "{{ .Values.networking.ENABLE_COMPACT }}"
           resources:
             requests:
               cpu: {{ index .Values "ovn-central" "requests" "cpu" }}

diff --git a/charts/values.yaml b/charts/values.yaml
@@ -52,6 +52,7 @@ networking:
   OVN_REMOTE_PROBE_INTERVAL: 10000
   OVN_REMOTE_OPENFLOW_INTERVAL: 180
   OVN_NORTHD_N_THREADS: 1
+  ENABLE_COMPACT: false
 
 func:
   ENABLE_LB: true

diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -34,6 +34,7 @@ DPDK_TUNNEL_IFACE=${DPDK_TUNNEL_IFACE:-br-phy}
 ENABLE_BIND_LOCAL_IP=${ENABLE_BIND_LOCAL_IP:-true}
 ENABLE_TPROXY=${ENABLE_TPROXY:-false}
 OVS_VSCTL_CONCURRENCY=${OVS_VSCTL_CONCURRENCY:-100}
+ENABLE_COMPACT=${ENABLE_COMPACT:-false}
 
 # debug
 DEBUG_WRAPPER=${DEBUG_WRAPPER:-}
@@ -3263,6 +3264,8 @@ spec:
               value: "5"
             - name: OVN_NORTHD_N_THREADS
               value: "1"
+            - name: ENABLE_COMPACT
+              value: "$ENABLE_COMPACT"
           resources:
             requests:
               cpu: 300m

diff --git a/dist/images/start-db.sh b/dist/images/start-db.sh
@@ -8,6 +8,7 @@ DEBUG_OPT="--ovn-northd-wrapper=$DEBUG_WRAPPER --ovsdb-nb-wrapper=$DEBUG_WRAPPER
 echo "PROBE_INTERVAL is set to $PROBE_INTERVAL"
 echo "OVN_LEADER_PROBE_INTERVAL is set to $OVN_LEADER_PROBE_INTERVAL"
 echo "OVN_NORTHD_N_THREADS is set to $OVN_NORTHD_N_THREADS"
+echo "ENABLE_COMPACT is set to $ENABLE_COMPACT"
 
 # https://bugs.launchpad.net/neutron/+bug/1776778
 if grep -q "3.10.0-862" /proc/version
@@ -496,4 +497,4 @@ ovs-appctl -t /var/run/ovn/ovnnb_db.ctl ovsdb-server/memory-trim-on-compaction o
 ovs-appctl -t /var/run/ovn/ovnsb_db.ctl ovsdb-server/memory-trim-on-compaction on
 
 chmod 600 /etc/ovn/*
-/kube-ovn/kube-ovn-leader-checker --probeInterval=${OVN_LEADER_PROBE_INTERVAL}
+/kube-ovn/kube-ovn-leader-checker --probeInterval=${OVN_LEADER_PROBE_INTERVAL} --enableCompact=${ENABLE_COMPACT}
diff --git a/pkg/ovn_leader_checker/ovn.go b/pkg/ovn_leader_checker/ovn.go
@@ -43,6 +43,7 @@ type Configuration struct {
 	KubeConfigFile string
 	KubeClient     kubernetes.Interface
 	ProbeInterval  int
+	EnableCompact  bool
 }
 
 // ParseFlags parses cmd args then init kubeclient and conf
@@ -51,6 +52,7 @@ func ParseFlags() (*Configuration, error) {
 	var (
 		argKubeConfigFile = pflag.String("kubeconfig", "", "Path to kubeconfig file with authorization and master location information. If not set use the inCluster token.")
 		argProbeInterval  = pflag.Int("probeInterval", DefaultProbeInterval, "interval of probing leader in seconds")
+		argEnableCompact  = pflag.Bool("enableCompact", true, "is enable compact")
 	)
 
 	klogFlags := flag.NewFlagSet("klog", flag.ContinueOnError)
@@ -80,6 +82,7 @@ func ParseFlags() (*Configuration, error) {
 	config := &Configuration{
 		KubeConfigFile: *argKubeConfigFile,
 		ProbeInterval:  *argProbeInterval,
+		EnableCompact:  *argEnableCompact,
 	}
 	return config, nil
 }
@@ -380,8 +383,11 @@ func doOvnLeaderCheck(cfg *Configuration, podName, podNamespace string) {
 			stealLock()
 		}
 	}
-	compactOvnDatabase("nb")
-	compactOvnDatabase("sb")
+
+	if cfg.EnableCompact {
+		compactOvnDatabase("nb")
+		compactOvnDatabase("sb")
+	}
 }
 
 func StartOvnLeaderCheck(cfg *Configuration) {

diff --git a/yamls/ovn-dpdk.yaml b/yamls/ovn-dpdk.yaml
@@ -238,6 +238,8 @@ spec:
               value: "5"
             - name: OVN_NORTHD_N_THREADS
               value: "1"
+            - name: ENABLE_COMPACT
+              value: "false"
           resources:
             requests:
               cpu: 500m

diff --git a/yamls/ovn-ha.yaml b/yamls/ovn-ha.yaml
@@ -129,6 +129,8 @@ spec:
               value: "5"
             - name: OVN_NORTHD_N_THREADS
               value: "1"
+            - name: ENABLE_COMPACT
+              value: "false"
           resources:
             requests:
               cpu: 300m