From b72ae0f36ad086c4f1d1f31397d5be7dd0680f36 Mon Sep 17 00:00:00 2001
From: Eugene Klimov <eklimov@altinity.com>
Date: Mon, 6 Jan 2025 19:16:42 +0500
Subject: [PATCH] change zookeeper readinessProbe to decrease downtime during
 version upgrade and quorum achievement (#1608)

---
 .../advanced/05-stateful-set-persistent-volume.yaml           | 3 ++-
 .../advanced/05-stateful-set-volume-emptyDir.yaml             | 3 ++-
 ...okeeper-1-node-1GB-for-tests-only-scaleout-pvc-secure.yaml | 2 +-
 .../zookeeper-1-node-1GB-for-tests-only-scaleout-pvc.yaml     | 2 +-
 .../zookeeper-1-node-1GB-for-tests-only.yaml                  | 4 ++--
 .../zookeeper-1-node-for-test-probes.yaml                     | 3 ++-
 .../quick-start-persistent-volume/zookeeper-1-node.yaml       | 4 ++--
 .../zookeeper-3-nodes-1GB-for-tests-only-scaleout-pvc.yaml    | 2 +-
 .../zookeeper-3-nodes-1GB-for-tests-only.yaml                 | 4 ++--
 .../zookeeper-3-nodes-for-test-probes.yaml                    | 3 ++-
 .../quick-start-persistent-volume/zookeeper-3-nodes.yaml      | 4 ++--
 .../quick-start-volume-emptyDir/zookeeper-1-node.yaml         | 4 ++--
 .../quick-start-volume-emptyDir/zookeeper-3-nodes.yaml        | 4 ++--
 .../zookeeper-operator-1-node-with-custom-probes.yaml         | 2 +-
 .../zookeeper-operator-3-nodes-with-custom-probes.yaml        | 2 +-
 15 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/deploy/zookeeper/zookeeper-manually/advanced/05-stateful-set-persistent-volume.yaml b/deploy/zookeeper/zookeeper-manually/advanced/05-stateful-set-persistent-volume.yaml
index 1a8848de1..9deb903fc 100644
--- a/deploy/zookeeper/zookeeper-manually/advanced/05-stateful-set-persistent-volume.yaml
+++ b/deploy/zookeeper/zookeeper-manually/advanced/05-stateful-set-persistent-volume.yaml
@@ -132,7 +132,8 @@ spec:
                 - bash
                 - -c
                 - "OK=$(echo ruok | nc 127.0.0.1 2181); if [[ \"$OK\" == \"imok\" ]]; then exit 0; else exit 1; fi"
-            initialDelaySeconds: 10
+            initialDelaySeconds: 15
+            periodSeconds: 10
             timeoutSeconds: 5
           livenessProbe:
             exec:
diff --git a/deploy/zookeeper/zookeeper-manually/advanced/05-stateful-set-volume-emptyDir.yaml b/deploy/zookeeper/zookeeper-manually/advanced/05-stateful-set-volume-emptyDir.yaml
index c1149bcd0..08f8f9fd7 100644
--- a/deploy/zookeeper/zookeeper-manually/advanced/05-stateful-set-volume-emptyDir.yaml
+++ b/deploy/zookeeper/zookeeper-manually/advanced/05-stateful-set-volume-emptyDir.yaml
@@ -132,7 +132,8 @@ spec:
                 - bash
                 - -c
                 - "OK=$(echo ruok | nc 127.0.0.1 2181); if [[ \"$OK\" == \"imok\" ]]; then exit 0; else exit 1; fi"
-            initialDelaySeconds: 10
+            initialDelaySeconds: 15
+            periodSeconds: 10
             timeoutSeconds: 5
           livenessProbe:
             exec:
diff --git a/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-1-node-1GB-for-tests-only-scaleout-pvc-secure.yaml b/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-1-node-1GB-for-tests-only-scaleout-pvc-secure.yaml
index f2385fcbb..5a0d989d7 100644
--- a/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-1-node-1GB-for-tests-only-scaleout-pvc-secure.yaml
+++ b/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-1-node-1GB-for-tests-only-scaleout-pvc-secure.yaml
@@ -613,7 +613,7 @@ spec:
               command:
                 - /conf/zookeeperReady.sh
             failureThreshold: 3
-            initialDelaySeconds: 10
+            initialDelaySeconds: 15
             periodSeconds: 10
             successThreshold: 1
             timeoutSeconds: 10
diff --git a/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-1-node-1GB-for-tests-only-scaleout-pvc.yaml b/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-1-node-1GB-for-tests-only-scaleout-pvc.yaml
index 9a40392eb..8fd35b843 100644
--- a/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-1-node-1GB-for-tests-only-scaleout-pvc.yaml
+++ b/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-1-node-1GB-for-tests-only-scaleout-pvc.yaml
@@ -566,7 +566,7 @@ spec:
               command:
                 - /conf/zookeeperReady.sh
             failureThreshold: 3
-            initialDelaySeconds: 10
+            initialDelaySeconds: 15
             periodSeconds: 10
             successThreshold: 1
             timeoutSeconds: 10
diff --git a/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-1-node-1GB-for-tests-only.yaml b/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-1-node-1GB-for-tests-only.yaml
index 0aa1e7918..ba5b2e919 100644
--- a/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-1-node-1GB-for-tests-only.yaml
+++ b/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-1-node-1GB-for-tests-only.yaml
@@ -211,8 +211,8 @@ spec:
                     exit 1;  
                   fi
                    '
-            initialDelaySeconds: 10
-            periodSeconds: 60
+            initialDelaySeconds: 15
+            periodSeconds: 10
             timeoutSeconds: 60
           livenessProbe:
             exec:
diff --git a/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-1-node-for-test-probes.yaml b/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-1-node-for-test-probes.yaml
index 634c490ce..e45e7b6b2 100644
--- a/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-1-node-for-test-probes.yaml
+++ b/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-1-node-for-test-probes.yaml
@@ -193,7 +193,8 @@ spec:
 #                - bash
 #                - -xc
 #                - 'OK=$(exec 3<>/dev/tcp/127.0.0.1/2181 ; printf "ruok" >&3 ; IFS=; tee <&3; exec 3<&- ;); if [[ "$OK" == "imok" ]]; then exit 0; else exit 1; fi'
-#            initialDelaySeconds: 20
+#            initialDelaySeconds: 15
+#            periodSeconds: 10
 #            timeoutSeconds: 15
           livenessProbe:
             exec:
diff --git a/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-1-node.yaml b/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-1-node.yaml
index c24f27789..7e04d8ebf 100644
--- a/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-1-node.yaml
+++ b/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-1-node.yaml
@@ -230,8 +230,8 @@ spec:
                     exit 1;  
                   fi
                    '
-            initialDelaySeconds: 10
-            periodSeconds: 60
+            initialDelaySeconds: 15
+            periodSeconds: 10
             timeoutSeconds: 60
           livenessProbe:
             exec:
diff --git a/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-3-nodes-1GB-for-tests-only-scaleout-pvc.yaml b/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-3-nodes-1GB-for-tests-only-scaleout-pvc.yaml
index 9044829dc..fcd77114c 100644
--- a/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-3-nodes-1GB-for-tests-only-scaleout-pvc.yaml
+++ b/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-3-nodes-1GB-for-tests-only-scaleout-pvc.yaml
@@ -566,7 +566,7 @@ spec:
               command:
                 - /conf/zookeeperReady.sh
             failureThreshold: 3
-            initialDelaySeconds: 10
+            initialDelaySeconds: 15
             periodSeconds: 10
             successThreshold: 1
             timeoutSeconds: 10
diff --git a/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-3-nodes-1GB-for-tests-only.yaml b/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-3-nodes-1GB-for-tests-only.yaml
index 68bf22703..dad2d73b6 100644
--- a/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-3-nodes-1GB-for-tests-only.yaml
+++ b/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-3-nodes-1GB-for-tests-only.yaml
@@ -211,8 +211,8 @@ spec:
                     exit 1;  
                   fi
                    '
-            initialDelaySeconds: 10
-            periodSeconds: 60
+            initialDelaySeconds: 15
+            periodSeconds: 10
             timeoutSeconds: 60
           livenessProbe:
             exec:
diff --git a/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-3-nodes-for-test-probes.yaml b/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-3-nodes-for-test-probes.yaml
index 8d043a0bc..9cd33ccd9 100644
--- a/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-3-nodes-for-test-probes.yaml
+++ b/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-3-nodes-for-test-probes.yaml
@@ -193,7 +193,8 @@ spec:
 #                - bash
 #                - -xc
 #                - 'OK=$(exec 3<>/dev/tcp/127.0.0.1/2181 ; printf "ruok" >&3 ; IFS=; tee <&3; exec 3<&- ;); if [[ "$OK" == "imok" ]]; then exit 0; else exit 1; fi'
-#            initialDelaySeconds: 20
+#            initialDelaySeconds: 15
+#            periodSeconds: 10
 #            timeoutSeconds: 15
           livenessProbe:
             exec:
diff --git a/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-3-nodes.yaml b/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-3-nodes.yaml
index 2ab53183f..85f254c8b 100644
--- a/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-3-nodes.yaml
+++ b/deploy/zookeeper/zookeeper-manually/quick-start-persistent-volume/zookeeper-3-nodes.yaml
@@ -230,8 +230,8 @@ spec:
                     exit 1;  
                   fi
                    '
-            initialDelaySeconds: 10
-            periodSeconds: 60
+            initialDelaySeconds: 15
+            periodSeconds: 10
             timeoutSeconds: 60
           livenessProbe:
             exec:
diff --git a/deploy/zookeeper/zookeeper-manually/quick-start-volume-emptyDir/zookeeper-1-node.yaml b/deploy/zookeeper/zookeeper-manually/quick-start-volume-emptyDir/zookeeper-1-node.yaml
index 247af99b7..a0a66bfcc 100644
--- a/deploy/zookeeper/zookeeper-manually/quick-start-volume-emptyDir/zookeeper-1-node.yaml
+++ b/deploy/zookeeper/zookeeper-manually/quick-start-volume-emptyDir/zookeeper-1-node.yaml
@@ -230,8 +230,8 @@ spec:
                     exit 1;  
                   fi
                    '
-            initialDelaySeconds: 10
-            periodSeconds: 60
+            initialDelaySeconds: 15
+            periodSeconds: 10
             timeoutSeconds: 60
           livenessProbe:
             exec:
diff --git a/deploy/zookeeper/zookeeper-manually/quick-start-volume-emptyDir/zookeeper-3-nodes.yaml b/deploy/zookeeper/zookeeper-manually/quick-start-volume-emptyDir/zookeeper-3-nodes.yaml
index e4dece68c..3d66ebb19 100644
--- a/deploy/zookeeper/zookeeper-manually/quick-start-volume-emptyDir/zookeeper-3-nodes.yaml
+++ b/deploy/zookeeper/zookeeper-manually/quick-start-volume-emptyDir/zookeeper-3-nodes.yaml
@@ -230,8 +230,8 @@ spec:
                     exit 1;  
                   fi
                    '
-            initialDelaySeconds: 10
-            periodSeconds: 60
+            initialDelaySeconds: 15
+            periodSeconds: 10
             timeoutSeconds: 60
           livenessProbe:
             exec:
diff --git a/deploy/zookeeper/zookeeper-with-zookeeper-operator/zookeeper-operator-1-node-with-custom-probes.yaml b/deploy/zookeeper/zookeeper-with-zookeeper-operator/zookeeper-operator-1-node-with-custom-probes.yaml
index 3a8d95a3c..8031059e4 100644
--- a/deploy/zookeeper/zookeeper-with-zookeeper-operator/zookeeper-operator-1-node-with-custom-probes.yaml
+++ b/deploy/zookeeper/zookeeper-with-zookeeper-operator/zookeeper-operator-1-node-with-custom-probes.yaml
@@ -474,7 +474,7 @@ spec:
           command:
             - /conf/zookeeperReady.sh
         failureThreshold: 3
-        initialDelaySeconds: 10
+        initialDelaySeconds: 15
         periodSeconds: 10
         successThreshold: 1
         timeoutSeconds: 10
diff --git a/deploy/zookeeper/zookeeper-with-zookeeper-operator/zookeeper-operator-3-nodes-with-custom-probes.yaml b/deploy/zookeeper/zookeeper-with-zookeeper-operator/zookeeper-operator-3-nodes-with-custom-probes.yaml
index b2268a8f2..f9335157a 100644
--- a/deploy/zookeeper/zookeeper-with-zookeeper-operator/zookeeper-operator-3-nodes-with-custom-probes.yaml
+++ b/deploy/zookeeper/zookeeper-with-zookeeper-operator/zookeeper-operator-3-nodes-with-custom-probes.yaml
@@ -474,7 +474,7 @@ spec:
           command:
             - /conf/zookeeperReady.sh
         failureThreshold: 3
-        initialDelaySeconds: 10
+        initialDelaySeconds: 15
         periodSeconds: 10
         successThreshold: 1
         timeoutSeconds: 10