fix

VictoriaMetrics · Jan 8, 2025 · 91e88e8 · 91e88e8
1 parent 2d2a2f0
commit 91e88e8
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 22 deletions.
diff --git a/charts/victoria-metrics-cluster/CHANGELOG.md b/charts/victoria-metrics-cluster/CHANGELOG.md
@@ -1,7 +1,7 @@
 ## Next release
 
-- vmstorage: remove readiness probe (reason: vminsert already handles routing and retries, and readiness probes can inadvertently introduce delays, DNS instability, and unnecessary disruptions)
-- all (except vmstorage): reduce the default readiness probe interval to 5s (was 15s) and the failure threshold to 10 (was 3).
+- Remove vmstorage readiness probe, as vminsert already handles routing and retries, while readiness probes can inadvertently introduce delays, DNS instability, and unnecessary disruptions.
+- Reduce the default readiness probe interval to 5s (was 15s) and the failure threshold to 10 (was 3).
 
 ## 0.16.2
 

diff --git a/charts/victoria-metrics-cluster/tests/__snapshot__/vmstorage_test.yaml.snap b/charts/victoria-metrics-cluster/tests/__snapshot__/vmstorage_test.yaml.snap
@@ -40,13 +40,6 @@ statefulset should match snapshot:
                 - --storageDataPath=/storage
               image: victoriametrics/vmstorage:0.1.0-cluster
               imagePullPolicy: IfNotPresent
-              livenessProbe:
-                failureThreshold: 10
-                initialDelaySeconds: 30
-                periodSeconds: 30
-                tcpSocket:
-                  port: http
-                timeoutSeconds: 5
               name: vmstorage
               ports:
                 - containerPort: 8482
@@ -55,6 +48,15 @@ statefulset should match snapshot:
                   name: vminsert
                 - containerPort: 8401
                   name: vmselect
+              readinessProbe:
+                failureThreshold: 10
+                httpGet:
+                  path: /health
+                  port: http
+                  scheme: HTTP
+                initialDelaySeconds: 5
+                periodSeconds: 5
+                timeoutSeconds: 5
               volumeMounts:
                 - mountPath: /storage
                   name: vmstorage-volume
@@ -115,13 +117,6 @@ statefulset should match snapshot with fullnameOverride, extraLabels and podLabe
                 - --storageDataPath=/storage
               image: victoriametrics/vmstorage:0.1.0-cluster
               imagePullPolicy: IfNotPresent
-              livenessProbe:
-                failureThreshold: 10
-                initialDelaySeconds: 30
-                periodSeconds: 30
-                tcpSocket:
-                  port: http
-                timeoutSeconds: 5
               name: vmstorage
               ports:
                 - containerPort: 8482
@@ -130,6 +125,15 @@ statefulset should match snapshot with fullnameOverride, extraLabels and podLabe
                   name: vminsert
                 - containerPort: 8401
                   name: vmselect
+              readinessProbe:
+                failureThreshold: 10
+                httpGet:
+                  path: /health
+                  port: http
+                  scheme: HTTP
+                initialDelaySeconds: 5
+                periodSeconds: 5
+                timeoutSeconds: 5
               volumeMounts:
                 - mountPath: /storage
                   name: vmstorage-volume

diff --git a/charts/victoria-metrics-cluster/values.yaml b/charts/victoria-metrics-cluster/values.yaml
@@ -1024,12 +1024,10 @@ vmstorage:
   # -- Readiness & Liveness probes
   probe:
     # -- VMStorage readiness probe
-    readiness: {}
-    # -- VMStorage liveness probe
-    liveness:
-      tcpSocket: {}
-      initialDelaySeconds: 30
-      periodSeconds: 30
+    readiness:
+      httpGet: {}
+      initialDelaySeconds: 5
+      periodSeconds: 5
       timeoutSeconds: 5
       failureThreshold: 10
     # -- VMStorage startup probe