[bitnami/redis] Fix issues in initialization/restarts

bitnami/redis/Chart.yaml

@@ -25,4 +25,4 @@ name: redis
 sources:
   - https://github.com/bitnami/bitnami-docker-redis
   - http://redis.io/
-version: 12.7.6
+version: 12.7.7

bitnami/redis/README.md

@@ -258,6 +258,7 @@ The following table lists the configurable parameters of the Redis<sup>TM</sup>
 | `sentinel.failoverTimeout`                            | Timeout for performing a election failover                                                                                                          | `18000`                                                 |
 | `sentinel.parallelSyncs`                              | Number of parallel syncs in the cluster                                                                                                             | `1`                                                     |
 | `sentinel.port`                                       | Redis<sup>TM</sup> Sentinel port                                                                                                                    | `26379`                                                 |
+| `sentinel.cleanWait`                                  | Seconds to wait when cleaning nodes IPs                                                                                                             | `5`                                                     |
 | `sentinel.configmap`                                  | Additional Redis<sup>TM</sup> configuration for the sentinel nodes (this value is evaluated as a template)                                          | `nil`                                                   |
 | `sentinel.staticID`                                   | Enable static IDs for sentinel replicas (If disabled IDs will be randomly generated on startup)                                                     | `false`                                                 |
 | `sentinel.service.type`                               | Kubernetes Service type (redis sentinel)                                                                                                            | `ClusterIP`                                             |

bitnami/redis/templates/configmap-scripts.yaml

@@ -12,6 +12,8 @@ data:
 {{- if and .Values.cluster.enabled .Values.sentinel.enabled }}
   start-node.sh: |
     #!/bin/bash
+    set -x
+
     is_boolean_yes() {
         local -r bool="${1:-}"
         # comparison is performed without regard to the case of alphabetic characters
@@ -22,10 +24,35 @@ data:
             false
         fi
     }
+    retry_while() {
+        local cmd="${1:?cmd is missing}"
+        local retries="${2:-12}"
+        local sleep_time="${3:-5}"
+        local return_value=1
+        read -r -a command <<< "$cmd"
+        for ((i = 1 ; i <= retries ; i+=1 )); do
+            "${command[@]}" && return_value=0 && break
+            sleep "$sleep_time"
+        done
+        return $return_value
+    }
+    not_exists_dns_entry() {
+      myip=$(hostname -i)
+
+      if [[ -z "$(getent ahosts "$HEADLESS_SERVICE" | grep "^${myip}" )" ]]; then
+        echo "$HEADLESS_SERVICE does not contain the IP of this pod: ${myip}"
+        return 1
+      fi
+      echo "$HEADLESS_SERVICE has my IP: ${myip}"
+      return 0
+    }
 
     HEADLESS_SERVICE="{{ template "redis.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}"
     REDIS_SERVICE="{{ template "redis.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}"
 
+    # Waits for DNS to add this ip to the service DNS entry
+    retry_while not_exists_dns_entry
+
     export REDIS_REPLICATION_MODE="slave"
     if [[ -z "$(getent ahosts "$HEADLESS_SERVICE" | grep -v "^$(hostname -i) ")" ]]; then
       export REDIS_REPLICATION_MODE="master"
@@ -137,6 +164,7 @@ data:
 
   start-sentinel.sh: |
     #!/bin/bash
+    set -x
     replace_in_file() {
         local filename="${1:?filename is required}"
         local match_regex="${2:?match regex is required}"
@@ -184,6 +212,28 @@ data:
     host_id() {
       echo "$1" | openssl sha1 | awk '{print $2}'
     }
+    retry_while() {
+        local cmd="${1:?cmd is missing}"
+        local retries="${2:-12}"
+        local sleep_time="${3:-5}"
+        local return_value=1
+        read -r -a command <<< "$cmd"
+        for ((i = 1 ; i <= retries ; i+=1 )); do
+            "${command[@]}" && return_value=0 && break
+            sleep "$sleep_time"
+        done
+        return $return_value
+    }
+    not_exists_dns_entry() {
+      myip=$(hostname -i)
+
+      if [[ -z "$(getent ahosts "$HEADLESS_SERVICE" | grep "^${myip}" )" ]]; then
+        echo "$HEADLESS_SERVICE does not contain the IP of this pod: ${myip}"
+        return 1
+      fi
+      echo "$HEADLESS_SERVICE has my IP: ${myip}"
+      return 0
+    }
 
     HEADLESS_SERVICE="{{ template "redis.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}"
     REDIS_SERVICE="{{ template "redis.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}"
@@ -207,10 +257,26 @@ data:
     fi
 
     export REDIS_REPLICATION_MODE="slave"
-    if [[ -z "$(getent ahosts "$HEADLESS_SERVICE" | grep -v "^$(hostname -i) ")" ]]; then
+
+    # Waits for DNS to add this ip to the service DNS entry
+    retry_while not_exists_dns_entry
+
+    if [[ -z "$(getent ahosts "$HEADLESS_SERVICE" | grep -v "^$(hostname -i)")" ]]; then
       export REDIS_REPLICATION_MODE="master"
     fi
 
+    # Clean sentineles from the current sentinel nodes
+    for node in $( getent ahosts "$HEADLESS_SERVICE" | grep -v "^$(hostname -i)" | cut -f 1 -d ' ' | uniq ); do
+      echo "Cleaning sentinels in sentinel node: $node"
+      if is_boolean_yes "$REDIS_SENTINEL_TLS_ENABLED"; then
+        redis-cli {{- if .Values.usePassword }} -a $REDIS_PASSWORD {{- end }} -h $node -p {{ .Values.sentinel.port }} --tls --cert ${REDIS_SENTINEL_TLS_CERT_FILE} --key ${REDIS_SENTINEL_TLS_KEY_FILE} --cacert ${REDIS_SENTINEL_TLS_CA_FILE} sentinel reset "*"
+      else
+        redis-cli {{- if .Values.usePassword }} -a $REDIS_PASSWORD {{- end }} -h $node -p {{ .Values.sentinel.port }} sentinel reset "*"
+      fi
+      sleep {{ .Values.sentinel.cleanWait }}
+    done
+    echo "Sentinels clean up done"
+
     if [[ "$REDIS_REPLICATION_MODE" == "master" ]]; then
       REDIS_MASTER_HOST="$(hostname -i)"
       REDIS_MASTER_PORT_NUMBER="{{ .Values.redisPort }}"

bitnami/redis/values.yaml

@@ -78,10 +78,17 @@ sentinel:
   masterSet: mymaster
   initialCheckTimeout: 5
   quorum: 2
-  downAfterMilliseconds: 60000
+  downAfterMilliseconds: 20000
   failoverTimeout: 18000
   parallelSyncs: 1
   port: 26379
+
+  ## Seconds to wait when cleaning nodes IPs
+  ## When starting it will clean the sentiles IP (RESET "*") in all the nodes
+  ## This is the time to wait before sending the command to the next node
+  ##
+  cleanWait: 5
+
   ## Additional Redis(TM) configuration for the sentinel nodes
   ## ref: https://redis.io/topics/config
   ##