Bug 1984049: Slow OVN Recovery on SNO

Signed-off-by: Flavio Fernandes <flaviof@redhat.com>
openshift · Aug 2, 2021 · 8abb965 · 8abb965
1 parent 65f9484
commit 8abb965
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/bindata/network/ovn-kubernetes/ovnkube-master.yaml b/bindata/network/ovn-kubernetes/ovnkube-master.yaml
@@ -374,7 +374,7 @@ spec:
                 - /var/run/ovn/ovnnb_db.ctl
                 - exit
         readinessProbe:
-          initialDelaySeconds: 90
+          initialDelaySeconds: {{.OVN_DB_PROBE_INITIAL_DELAY}}
           timeoutSeconds: 5
           exec:
             command:
@@ -711,7 +711,7 @@ spec:
                 - /var/run/ovn/ovnsb_db.ctl
                 - exit
         readinessProbe:
-          initialDelaySeconds: 90
+          initialDelaySeconds: {{.OVN_DB_PROBE_INITIAL_DELAY}}
           timeoutSeconds: 5
           exec:
             command:

diff --git a/pkg/network/ovn_kubernetes.go b/pkg/network/ovn_kubernetes.go
@@ -168,8 +168,10 @@ func renderOVNKubernetes(conf *operv1.NetworkSpec, bootstrapResult *bootstrap.Bo
 
 	if len(bootstrapResult.OVN.MasterIPs) == 1 {
 		data.Data["IsSNO"] = true
+		data.Data["OVN_DB_PROBE_INITIAL_DELAY"] = 0
 	} else {
 		data.Data["IsSNO"] = false
+		data.Data["OVN_DB_PROBE_INITIAL_DELAY"] = 90
 	}
 
 	manifests, err := render.RenderDir(filepath.Join(manifestDir, "network/ovn-kubernetes"), &data)