K8SPS-465 adjust probes for haproxy (#1027)

* K8SPS-465 adjust probes for haproxy

* remove error word from info log

* update e2e test for haproxy

---------

Co-authored-by: Viacheslav Sarzhan <[email protected]>

Author: gkech

api/v1alpha1/perconaservermysql_types.go

@@ -790,30 +790,36 @@ func (cr *PerconaServerMySQL) CheckNSetDefaults(_ context.Context, serverVersion
 		cr.Spec.Proxy.HAProxy = new(HAProxySpec)
 	}
 
-	if cr.Spec.Proxy.HAProxy.LivenessProbe.PeriodSeconds == 0 {
-		cr.Spec.Proxy.HAProxy.LivenessProbe.PeriodSeconds = 5
+	if cr.Spec.Proxy.HAProxy.LivenessProbe.InitialDelaySeconds == 0 {
+		cr.Spec.Proxy.HAProxy.LivenessProbe.InitialDelaySeconds = 60
 	}
-	if cr.Spec.Proxy.HAProxy.LivenessProbe.FailureThreshold == 0 {
-		cr.Spec.Proxy.HAProxy.LivenessProbe.FailureThreshold = 3
+	if cr.Spec.Proxy.HAProxy.LivenessProbe.TimeoutSeconds == 0 {
+		cr.Spec.Proxy.HAProxy.LivenessProbe.TimeoutSeconds = 3
+	}
+	if cr.Spec.Proxy.HAProxy.LivenessProbe.PeriodSeconds == 0 {
+		cr.Spec.Proxy.HAProxy.LivenessProbe.PeriodSeconds = 30
 	}
 	if cr.Spec.Proxy.HAProxy.LivenessProbe.SuccessThreshold == 0 {
 		cr.Spec.Proxy.HAProxy.LivenessProbe.SuccessThreshold = 1
 	}
-	if cr.Spec.Proxy.HAProxy.LivenessProbe.TimeoutSeconds == 0 {
-		cr.Spec.Proxy.HAProxy.LivenessProbe.TimeoutSeconds = 3
+	if cr.Spec.Proxy.HAProxy.LivenessProbe.FailureThreshold == 0 {
+		cr.Spec.Proxy.HAProxy.LivenessProbe.FailureThreshold = 4
 	}
 
+	if cr.Spec.Proxy.HAProxy.ReadinessProbe.InitialDelaySeconds == 0 {
+		cr.Spec.Proxy.HAProxy.ReadinessProbe.InitialDelaySeconds = 15
+	}
+	if cr.Spec.Proxy.HAProxy.ReadinessProbe.TimeoutSeconds == 0 {
+		cr.Spec.Proxy.HAProxy.ReadinessProbe.TimeoutSeconds = 1
+	}
 	if cr.Spec.Proxy.HAProxy.ReadinessProbe.PeriodSeconds == 0 {
 		cr.Spec.Proxy.HAProxy.ReadinessProbe.PeriodSeconds = 5
 	}
-	if cr.Spec.Proxy.HAProxy.ReadinessProbe.FailureThreshold == 0 {
-		cr.Spec.Proxy.HAProxy.ReadinessProbe.FailureThreshold = 3
-	}
 	if cr.Spec.Proxy.HAProxy.ReadinessProbe.SuccessThreshold == 0 {
 		cr.Spec.Proxy.HAProxy.ReadinessProbe.SuccessThreshold = 1
 	}
-	if cr.Spec.Proxy.HAProxy.ReadinessProbe.TimeoutSeconds == 0 {
-		cr.Spec.Proxy.HAProxy.ReadinessProbe.TimeoutSeconds = 3
+	if cr.Spec.Proxy.HAProxy.ReadinessProbe.FailureThreshold == 0 {
+		cr.Spec.Proxy.HAProxy.ReadinessProbe.FailureThreshold = 3
 	}
 
 	var fsgroup *int64

e2e-tests/tests/haproxy/01-assert.yaml

@@ -44,14 +44,15 @@ spec:
         - name: LIVENESS_CHECK_TIMEOUT
           value: "30"
         - name: READINESS_CHECK_TIMEOUT
-          value: "3"
+          value: "1"
         image: perconalab/percona-server-mysql-operator:main-haproxy
         imagePullPolicy: Always
         livenessProbe:
           exec:
             command:
             - /opt/percona/haproxy_liveness_check.sh
-          failureThreshold: 3
+          initialDelaySeconds: 60
+          failureThreshold: 4
           periodSeconds: 10
           successThreshold: 1
           timeoutSeconds: 30
@@ -73,10 +74,11 @@ spec:
           exec:
             command:
             - /opt/percona/haproxy_readiness_check.sh
+          initialDelaySeconds: 15
           failureThreshold: 40
           periodSeconds: 5
           successThreshold: 10
-          timeoutSeconds: 3
+          timeoutSeconds: 1
         resources:
           requests:
             cpu: 600m

pkg/haproxy/haproxy_test.go

@@ -153,19 +153,21 @@ func TestStatefulset(t *testing.T) {
 			ProbeHandler: corev1.ProbeHandler{
 				Exec: &corev1.ExecAction{Command: []string{"/opt/percona/haproxy_readiness_check.sh"}},
 			},
-			TimeoutSeconds:   3,
-			PeriodSeconds:    5,
-			FailureThreshold: 3,
-			SuccessThreshold: 1,
+			InitialDelaySeconds: 15,
+			TimeoutSeconds:      1,
+			PeriodSeconds:       5,
+			SuccessThreshold:    1,
+			FailureThreshold:    3,
 		}
 		expectedLivenessProbe := corev1.Probe{
 			ProbeHandler: corev1.ProbeHandler{
 				Exec: &corev1.ExecAction{Command: []string{"/opt/percona/haproxy_liveness_check.sh"}},
 			},
-			TimeoutSeconds:   3,
-			PeriodSeconds:    5,
-			FailureThreshold: 3,
-			SuccessThreshold: 1,
+			InitialDelaySeconds: 60,
+			TimeoutSeconds:      3,
+			PeriodSeconds:       30,
+			SuccessThreshold:    1,
+			FailureThreshold:    4,
 		}
 
 		assert.Equal(t, expectedReadinessProbe, *hContainer.ReadinessProbe)

pkg/topology/topology.go

@@ -34,7 +34,7 @@ func GroupReplication(ctx context.Context, cli client.Client, cliCmd clientcmd.C
 
 	pod, err := getReadyPod(ctx, cli, cluster)
 	if err != nil {
-		logger.Info(errors.Wrap(err, "error getting ready pod").Error())
+		logger.Info(errors.Wrap(err, "getting ready pod").Error())
 		return Topology{}, nil
 	}