perf: increase ovn-nb timeout

For large scale, time to ovn-nb might increase and the 10s timeout might cause flip-flops (cherry picked from commit 78a77f7)
kubeovn · Sep 16, 2021 · 34ba16e · 34ba16e
1 parent f844a2b
commit 34ba16e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/dist/images/kube-ovn-controller-healthcheck.sh b/dist/images/kube-ovn-controller-healthcheck.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -euo pipefail
 
-OVN_NB_DAEMON=/var/run/ovn/ovn-nbctl.$(cat /var/run/ovn/ovn-nbctl.pid).ctl ovn-nbctl --timeout=15 lr-list > /dev/null
+OVN_NB_DAEMON=/var/run/ovn/ovn-nbctl.$(cat /var/run/ovn/ovn-nbctl.pid).ctl ovn-nbctl --timeout=60 lr-list > /dev/null
 
 nc -z -w3 127.0.0.1 10660
 

diff --git a/pkg/controller/config.go b/pkg/controller/config.go
@@ -67,7 +67,7 @@ func ParseFlags() (*Configuration, error) {
 	var (
 		argOvnNbAddr      = pflag.String("ovn-nb-addr", "", "ovn-nb address")
 		argOvnSbAddr      = pflag.String("ovn-sb-addr", "", "ovn-sb address")
-		argOvnTimeout     = pflag.Int("ovn-timeout", 30, "")
+		argOvnTimeout     = pflag.Int("ovn-timeout", 60, "")
 		argKubeConfigFile = pflag.String("kubeconfig", "", "Path to kubeconfig file with authorization and master location information. If not set use the inCluster token.")
 
 		argDefaultLogicalSwitch = pflag.String("default-ls", "ovn-default", "The default logical switch name, default: ovn-default")

diff --git a/pkg/ovs/ovn-nbctl.go b/pkg/ovs/ovn-nbctl.go
@@ -1331,7 +1331,7 @@ func StartOvnNbctlDaemon(ovnNbAddr string) error {
 func CheckAlive() error {
 	output, err := exec.Command(
 		"ovn-nbctl",
-		"--timeout=10",
+		"--timeout=60",
 		"show",
 	).CombinedOutput()