fixed reset password

Author: polefishu

pkg/redisutil/admin.go

@@ -532,14 +532,14 @@ func (a *Admin) ResetPassword(newPassword string) error {
 	}
 	for addr, c := range a.Connections().GetAll() {
 		a.log.Info("reset password", "addr", addr)
-		setPasswdResp := c.Cmd("CONFIG", "SET", "requirepass", newPassword)
-		if err := a.Connections().ValidateResp(setPasswdResp, addr, "cannot set new requirepass"); err != nil {
-			return err
-		}
 		setMasterauth := c.Cmd("CONFIG", "SET", "masterauth", newPassword)
 		if err := a.Connections().ValidateResp(setMasterauth, addr, "cannot set new masterauth"); err != nil {
 			return err
 		}
+		setPasswdResp := c.Cmd("CONFIG", "SET", "requirepass", newPassword)
+		if err := a.Connections().ValidateResp(setPasswdResp, addr, "cannot set new requirepass"); err != nil {
+			return err
+		}
 	}
 	return nil
 }

pkg/resources/configmaps/configmap.go

@@ -29,9 +29,13 @@ failover() {
     echo "Master: ${masterID}"
     slave=$(cat ${CLUSTER_CONFIG} | grep ${masterID} | grep "slave" | awk 'NR==1{print $2}' | sed 's/:6379@16379//')
     echo "Slave: ${slave}"
-    redis-cli -h ${slave} -a "${REDIS_PASSWORD}" CLUSTER FAILOVER
-	echo "Wait for MASTER <-> SLAVE syncFinished"
-	sleep 20
+    if [[ -z "${REDIS_PASSWORD}" ]]; then
+        redis-cli -h ${slave} CLUSTER FAILOVER
+    else
+        redis-cli -h ${slave} -a "${REDIS_PASSWORD}" CLUSTER FAILOVER
+    fi
+    echo "Wait for MASTER <-> SLAVE syncFinished"
+    sleep 20
 }
 if [ -f ${CLUSTER_CONFIG} ]; then
     cat ${CLUSTER_CONFIG} | grep "myself" | grep "master" && \