From 121c9a41a1c0b01395e38f7d8a5ed0e62f972564 Mon Sep 17 00:00:00 2001 From: Mengxin Liu Date: Tue, 14 Sep 2021 16:48:55 +0800 Subject: [PATCH] perf: increase ovn-nb timeout For large scale, time to ovn-nb might increase and the 10s timeout might cause flip-flops --- dist/images/kube-ovn-controller-healthcheck.sh | 2 +- pkg/controller/config.go | 2 +- pkg/ovs/ovn-nbctl.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/images/kube-ovn-controller-healthcheck.sh b/dist/images/kube-ovn-controller-healthcheck.sh index dff27be42f0..9bb4220f148 100644 --- 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 index 7f25bb98c2e..8f17f0086fa 100644 --- a/pkg/controller/config.go +++ b/pkg/controller/config.go @@ -63,7 +63,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 index f5d9dc1a0f2..b3792aafb95 100644 --- a/pkg/ovs/ovn-nbctl.go +++ b/pkg/ovs/ovn-nbctl.go @@ -1089,7 +1089,7 @@ func StartOvnNbctlDaemon(ovnNbAddr string) error { func CheckAlive() error { output, err := exec.Command( "ovn-nbctl", - "--timeout=10", + "--timeout=60", "show", ).CombinedOutput()