chore: redis backup support empty default password (#2302)

Author: wangyelei

addons/redis/dataprotection/backup.sh

@@ -15,6 +15,9 @@ trap handle_exit EXIT
 export PATH="$PATH:$DP_DATASAFED_BIN_PATH"
 export DATASAFED_BACKEND_BASE_PATH="$DP_BACKUP_BASE_PATH"
 connect_url="redis-cli -h ${DP_DB_HOST} -p ${DP_DB_PORT} -a ${DP_DB_PASSWORD}"
+if [ -z ${DP_DB_PASSWORD} ]; then
+  connect_url="redis-cli -h ${DP_DB_HOST} -p ${DP_DB_PORT}"
+fi
 last_save=$(${connect_url} LASTSAVE)
 echo "INFO: start BGSAVE"
 ${connect_url} BGSAVE

addons/redis/dataprotection/pitr-backup.sh

@@ -3,6 +3,9 @@ export PATH="$PATH:$DP_DATASAFED_BIN_PATH"
 export DATASAFED_BACKEND_BASE_PATH="$DP_BACKUP_BASE_PATH"
 
 connect_url="redis-cli -h ${DP_DB_HOST} -p ${DP_DB_PORT} -a ${DP_DB_PASSWORD}"
+if [ -z ${DP_DB_PASSWORD} ]; then
+  connect_url="redis-cli -h ${DP_DB_HOST} -p ${DP_DB_PORT}"
+fi
 global_last_purge_time=$(date +%s)
 global_aof_last_modify_time=0
 global_acl_last_modify_time=0

addons/redis/scripts/redis-account.sh

@@ -16,6 +16,9 @@ function do_acl_command() {
         # we need to remove the @1 or @2 and remove the port
         host=$(echo "$host" | sed 's/@[0-9]*//g' | sed 's/:[0-9]*/ /g')
         cmd="redis-cli -h $host -p $service_port --user $user -a $password"
+        if [ -z "$password" ]; then
+            cmd="redis-cli -h $host -p $service_port --user $user"
+        fi
         if [ -n "$ACL_COMMAND" ]; then
             echo "DO ACL COMMAND FOR HOST: $host"
             $cmd $ACL_COMMAND
@@ -54,11 +57,6 @@ function env_pre_check() {
         exit 1
     fi
 
-    if [ -z "$REDIS_DEFAULT_PASSWORD" ]; then
-        echo "REDIS_DEFAULT_PASSWORD is empty, skip ACL operation"
-        exit 1
-    fi
-
     # cluster mode don't have KB_POD_LIST, but have REDIS_POD_FQDN_LIST and get hosts from redis-cli
     if [ "$SHARD_MODE" != "TRUE" ] && [ -z "$REDIS_POD_FQDN_LIST" ]; then
         echo "REDIS_POD_FQDN_LIST is empty, skip ACL operation"
@@ -99,10 +97,13 @@ function create_post_check() {
 }
 
 function get_cluster_host_list() {
+    passwd_cmd="-a $REDIS_DEFAULT_PASSWORD"
+    if [ -z "$REDIS_DEFAULT_PASSWORD" ]; then
+        passwd_cmd=""
+    fi
     host_list=$(redis-cli -c -h "$CURRENT_POD_NAME.$CURRENT_SHARD_COMPONENT_NAME-headless.$CLUSTER_NAMESPACE.svc.$CLUSTER_DOMAIN" \
         -p $SERVICE_PORT \
-        --user $REDIS_DEFAULT_USER \
-        -a $REDIS_DEFAULT_PASSWORD \
+        --user $REDIS_DEFAULT_USER $passwd_cmd \
         CLUSTER NODES |
         grep -v "fail" |
         grep -v "noaddr" |

addons/redis/scripts/reset-master.sh

@@ -5,7 +5,11 @@ fi
 for sentinel_pod in $(echo ${SENTINEL_POD_NAME_LIST} | tr ',' '\n'); do
     echo "reset master in sentinel ${pod}..."
     fqdn="$sentinel_pod.$SENTINEL_HEADLESS_SERVICE_NAME.$CLUSTER_NAMESPACE.svc.cluster.local"
-    redis-cli -h $fqdn -p 26379 -a ${SENTINEL_PASSWORD} sentinel reset ${REDIS_COMPONENT_NAME}
+    if [ -n "${SENTINEL_PASSWORD}" ]; then
+        redis-cli -h $fqdn -p 26379 -a ${SENTINEL_PASSWORD} sentinel reset ${REDIS_COMPONENT_NAME}
+    else
+        redis-cli -h $fqdn -p 26379 sentinel reset ${REDIS_COMPONENT_NAME}
+    fi
     if [ $? -eq 0 ]; then
         echo "reset master in sentinel ${pod} succeeded"
         exit 0