Skip to content

Commit ce3ddfc

Browse files
wangyeleiwangyelei
committed
fix bug
1 parent 218abb6 commit ce3ddfc

20 files changed

+60
-122
lines changed

‎addons/redis/scripts/redis-account-provision.sh‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
#!/bin/sh
2-
3-
if [ "$TLS_ENABLED" == "true" ]; then
4-
redis_base_cmd="redis-cli -p $SERVICE_PORT -a $REDIS_DEFAULT_PASSWORD --tls --cacert ${TLS_MOUNT_PATH}/ca.crt"
5-
else
6-
redis_base_cmd="redis-cli -p $SERVICE_PORT -a $REDIS_DEFAULT_PASSWORD"
7-
fi
8-
2+
redis_base_cmd="redis-cli -p $SERVICE_PORT -a $REDIS_DEFAULT_PASSWORD $REDIS_CLI_TLS_CMD"
93
$redis_base_cmd ${KB_ACCOUNT_STATEMENT}
104
$redis_base_cmd acl save

‎addons/redis/scripts/redis-account.sh‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22

33
set -e
44
service_port=${SERVICE_PORT:-6379}
5-
tls_cmd=""
6-
if [ "$TLS_ENABLED" == "true" ]; then
7-
tls_cmd="--tls --insecure"
8-
fi
95

106
function do_acl_command() {
117
local hosts=$1
@@ -19,9 +15,9 @@ function do_acl_command() {
1915
# in case of fixed ip mode, the host is like this: 10.96.180.100:6379@1 10.96.180.100:6379@2
2016
# we need to remove the @1 or @2 and remove the port
2117
host=$(echo "$host" | sed 's/@[0-9]*//g' | sed 's/:[0-9]*/ /g')
22-
cmd="redis-cli -h $host -p $service_port --user $user -a $password $tls_cmd"
18+
cmd="redis-cli -h $host -p $service_port --user $user -a $password $REDIS_CLI_TLS_CMD"
2319
if [ -z "$password" ]; then
24-
cmd="redis-cli -h $host -p $service_port --user $user $tls_cmd"
20+
cmd="redis-cli -h $host -p $service_port --user $user $REDIS_CLI_TLS_CMD"
2521
fi
2622
if [ -n "$ACL_COMMAND" ]; then
2723
echo "DO ACL COMMAND FOR HOST: $host"
@@ -102,7 +98,7 @@ function get_cluster_host_list() {
10298
fi
10399
host_list=$(redis-cli -c -h "$CURRENT_POD_NAME.$CURRENT_SHARD_COMPONENT_NAME-headless.$CLUSTER_NAMESPACE.svc.$CLUSTER_DOMAIN" \
104100
-p $service_port \
105-
--user $REDIS_DEFAULT_USER $passwd_cmd $tls_cmd \
101+
--user $REDIS_DEFAULT_USER $passwd_cmd $REDIS_CLI_TLS_CMD \
106102
CLUSTER NODES |
107103
grep -v "fail" |
108104
grep -v "noaddr" |

‎addons/redis/scripts/redis-ping.sh‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,10 @@ load_common_library() {
2929
check_redis_ok() {
3030
unset_xtrace_when_ut_mode_false
3131
service_port=${SERVICE_PORT:-6379}
32-
tls_cmd=""
33-
if [ "$TLS_ENABLED" == "true" ]; then
34-
tls_cmd="--tls --cacert ${TLS_MOUNT_PATH}/ca.crt"
35-
fi
3632
if ! is_empty "$REDIS_DEFAULT_PASSWORD"; then
37-
cmd="redis-cli -h localhost -p $service_port -a $REDIS_DEFAULT_PASSWORD $tls_cmd ping"
33+
cmd="redis-cli -h localhost -p $service_port -a $REDIS_DEFAULT_PASSWORD $REDIS_CLI_TLS_CMD ping"
3834
else
39-
cmd="redis-cli -h localhost -p $service_port $tls_cmd ping"
35+
cmd="redis-cli -h localhost -p $service_port $REDIS_CLI_TLS_CMD ping"
4036
fi
4137
response=$($cmd)
4238
status=$?

‎addons/redis/scripts/redis-pre-stop.sh‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ test || __() {
1919
set -e;
2020
}
2121

22-
tls_cmd=""
23-
if [ "$TLS_ENABLED" == "true" ]; then
24-
tls_cmd="--tls --cacert ${TLS_MOUNT_PATH}/ca.crt"
25-
fi
26-
2722
load_common_library() {
2823
# the common.sh scripts is mounted to the same path which is defined in the cmpd.spec.scripts
2924
common_library_file="/scripts/common.sh"
@@ -33,15 +28,11 @@ load_common_library() {
3328

3429
acl_save_before_stop() {
3530
service_port=${SERVICE_PORT:-6379}
36-
tls_cmd=""
37-
if [ "$TLS_ENABLED" == "true" ]; then
38-
tls_cmd="--tls --cacert ${TLS_MOUNT_PATH}/ca.crt"
39-
fi
4031
if ! is_empty "$REDIS_DEFAULT_PASSWORD"; then
41-
acl_save_command="redis-cli -h localhost -p $service_port -a $REDIS_DEFAULT_PASSWORD $tls_cmd acl save"
32+
acl_save_command="redis-cli -h localhost -p $service_port -a $REDIS_DEFAULT_PASSWORD $REDIS_CLI_TLS_CMD acl save"
4233
logging_mask_acl_save_command="${acl_save_command/$REDIS_DEFAULT_PASSWORD/********}"
4334
else
44-
acl_save_command="redis-cli -h localhost -p $service_port $tls_cmd acl save"
35+
acl_save_command="redis-cli -h localhost -p $service_port $REDIS_CLI_TLS_CMD acl save"
4536
logging_mask_acl_save_command="$acl_save_command"
4637
fi
4738
echo "acl save command: $logging_mask_acl_save_command"

‎addons/redis/scripts/redis-register-to-sentinel.sh‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@ else
3434
FIXED_POD_IP_ENABLED=false
3535
fi
3636

37-
tls_cmd=""
38-
if [ "$TLS_ENABLED" == "true" ]; then
39-
tls_cmd="--tls --cacert ${TLS_MOUNT_PATH}/ca.crt"
40-
fi
41-
4237
load_common_library() {
4338
# the common.sh scripts is mounted to the same path which is defined in the cmpd.spec.scripts
4439
common_library_file="/scripts/common.sh"
@@ -153,9 +148,9 @@ check_connectivity() {
153148
local password=$3
154149
echo "Checking connectivity to $host on port $port using redis-cli..."
155150
if is_empty "$password"; then
156-
redis-cli -h "$host" -p "$port" $tls_cmd PING | grep -q "PONG"
151+
redis-cli -h "$host" -p "$port" $REDIS_CLI_TLS_CMD PING | grep -q "PONG"
157152
else
158-
redis-cli -h "$host" -p "$port" -a "$password" $tls_cmd PING | grep -q "PONG"
153+
redis-cli -h "$host" -p "$port" -a "$password" $REDIS_CLI_TLS_CMD PING | grep -q "PONG"
159154
fi
160155
if [ $? -eq 0 ]; then
161156
echo "$host is reachable on port $port."
@@ -174,9 +169,9 @@ execute_sentinel_sub_command() {
174169

175170
local output
176171
if is_empty "$SENTINEL_PASSWORD"; then
177-
output=$(redis-cli -h "$sentinel_host" -p "$sentinel_port" $tls_cmd $command)
172+
output=$(redis-cli -h "$sentinel_host" -p "$sentinel_port" $REDIS_CLI_TLS_CMD $command)
178173
else
179-
output=$(redis-cli -h "$sentinel_host" -p "$sentinel_port" -a "$SENTINEL_PASSWORD" $tls_cmd $command)
174+
output=$(redis-cli -h "$sentinel_host" -p "$sentinel_port" -a "$SENTINEL_PASSWORD" $REDIS_CLI_TLS_CMD $command)
180175
fi
181176
local status=$?
182177
echo "$output"
@@ -196,9 +191,9 @@ get_master_addr_by_name(){
196191
local command=$3
197192
local output
198193
if is_empty "$SENTINEL_PASSWORD"; then
199-
output=$(redis-cli -h "$sentinel_host" -p "$sentinel_port" $tls_cmd $command)
194+
output=$(redis-cli -h "$sentinel_host" -p "$sentinel_port" $REDIS_CLI_TLS_CMD $command)
200195
else
201-
output=$(redis-cli -h "$sentinel_host" -p "$sentinel_port" -a "$SENTINEL_PASSWORD" $tls_cmd $command)
196+
output=$(redis-cli -h "$sentinel_host" -p "$sentinel_port" -a "$SENTINEL_PASSWORD" $REDIS_CLI_TLS_CMD $command)
202197
fi
203198
local status=$?
204199
if [ $status -ne 0 ]; then

‎addons/redis/scripts/redis-sentinel-account-provision.sh‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
#!/bin/sh
22

3-
if [ "$TLS_ENABLED" == "true" ]; then
4-
redis_base_cmd="redis-cli -p $SENTINEL_SERVICE_PORT -a $SENTINEL_PASSWORD --tls --cacert ${TLS_MOUNT_PATH}/ca.crt"
5-
else
6-
redis_base_cmd="redis-cli -p $SENTINEL_SERVICE_PORT -a $SENTINEL_PASSWORD"
7-
fi
8-
3+
redis_base_cmd="redis-cli -p $SENTINEL_SERVICE_PORT -a $SENTINEL_PASSWORD $REDIS_CLI_TLS_CMD"
94
$redis_base_cmd ${KB_ACCOUNT_STATEMENT}
105
$redis_base_cmd acl save

‎addons/redis/scripts/redis-sentinel-member-join.sh‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,10 @@ temp_output=""
6565
redis_sentinel_get_masters() {
6666
local host=$1
6767
local port=$2
68-
tls_cmd=""
69-
if [ "$TLS_ENABLED" == "true" ]; then
70-
tls_cmd="--tls --cacert ${TLS_MOUNT_PATH}/ca.crt"
71-
fi
7268
if [ -n "$SENTINEL_PASSWORD" ]; then
73-
temp_output=$(redis-cli -h "$host" -p "$port" -a "$SENTINEL_PASSWORD" $tls_cmd sentinel masters 2>/dev/null || true)
69+
temp_output=$(redis-cli -h "$host" -p "$port" -a "$SENTINEL_PASSWORD" $REDIS_CLI_TLS_CMD sentinel masters 2>/dev/null || true)
7470
else
75-
temp_output=$(redis-cli -h "$host" -p "$port" $tls_cmd sentinel masters 2>/dev/null || true)
71+
temp_output=$(redis-cli -h "$host" -p "$port" $REDIS_CLI_TLS_CMD sentinel masters 2>/dev/null || true)
7672
fi
7773
}
7874

‎addons/redis/scripts/redis-sentinel-member-leave.sh‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ declare -A master_slave_counts
3131
declare -g sentinel_leave_member_name
3232
declare -g sentinel_leave_member_fqdn
3333
declare -a sentinel_pod_list
34-
tls_cmd=""
35-
if [ "$TLS_ENABLED" == "true" ]; then
36-
tls_cmd="--tls --cacert ${TLS_MOUNT_PATH}/ca.crt"
37-
fi
3834

3935
redis_sentinel_member_get() {
4036
if [ -z "$KB_LEAVE_MEMBER_POD_FQDN" ]; then
@@ -62,9 +58,9 @@ redis_sentinel_get_masters() {
6258
local host="$1"
6359
local port="$2"
6460
if [ -n "$SENTINEL_PASSWORD" ]; then
65-
temp_output=$(redis-cli -h "$host" -p "$port" -a "$SENTINEL_PASSWORD" $tls_cmd SENTINEL MASTERS 2>/dev/null || true)
61+
temp_output=$(redis-cli -h "$host" -p "$port" -a "$SENTINEL_PASSWORD" $REDIS_CLI_TLS_CMD sentinel masters 2>/dev/null || true)
6662
else
67-
temp_output=$(redis-cli -h "$host" -p "$port" $tls_cmd SENTINEL MASTERS 2>/dev/null || true)
63+
temp_output=$(redis-cli -h "$host" -p "$port" $REDIS_CLI_TLS_CMD sentinel masters 2>/dev/null || true)
6864
fi
6965
}
7066

@@ -124,9 +120,9 @@ redis_sentinel_remove_monitor() {
124120
if [[ -n "$master_name" ]]; then
125121
echo "master name: $master_name"
126122
if [ -z "$SENTINEL_PASSWORD" ]; then
127-
redis-cli -h "$sentinel_leave_member_fqdn" -p "$redis_default_service_port" $tls_cmd SENTINEL REMOVE "$master_name"
123+
redis-cli -h "$sentinel_leave_member_fqdn" -p "$redis_default_service_port" $REDIS_CLI_TLS_CMD SENTINEL REMOVE "$master_name"
128124
else
129-
redis-cli -h "$sentinel_leave_member_fqdn" -p "$redis_default_service_port" -a "$SENTINEL_PASSWORD" $tls_cmd SENTINEL REMOVE "$master_name"
125+
redis-cli -h "$sentinel_leave_member_fqdn" -p "$redis_default_service_port" -a "$SENTINEL_PASSWORD" $REDIS_CLI_TLS_CMD SENTINEL REMOVE "$master_name"
130126
fi
131127
echo "sentinel no longer monitors $master_name"
132128
master_name=""
@@ -148,13 +144,13 @@ redis_sentinel_reset_all() {
148144
success=false
149145
while [ $retry_count -lt $max_retries ]; do
150146
if [ -n "$SENTINEL_PASSWORD" ]; then
151-
if redis-cli -h "$host" -p "$redis_default_service_port" -a "$SENTINEL_PASSWORD" $tls_cmd SENTINEL RESET "*"; then
147+
if redis-cli -h "$host" -p "$redis_default_service_port" -a "$SENTINEL_PASSWORD" $REDIS_CLI_TLS_CMD SENTINEL RESET "*"; then
152148
echo "sentinel is resetting at $host on port $redis_default_service_port."
153149
success=true
154150
break
155151
fi
156152
else
157-
if redis-cli -h "$host" -p "$redis_default_service_port" $tls_cmd SENTINEL RESET "*" ; then
153+
if redis-cli -h "$host" -p "$redis_default_service_port" $REDIS_CLI_TLS_CMD SENTINEL RESET "*" ; then
158154
echo "sentinel is resetting at $host on port $redis_default_service_port."
159155
success=true
160156
break

‎addons/redis/scripts/redis-sentinel-ping.sh‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,10 @@ load_common_library() {
2929
check_redis_sentinel_ok() {
3030
unset_xtrace_when_ut_mode_false
3131
sentinel_service_port=${SENTINEL_SERVICE_PORT:-26379}
32-
tls_cmd=""
33-
if [ "$TLS_ENABLED" == "true" ]; then
34-
tls_cmd="--tls --cacert ${TLS_MOUNT_PATH}/ca.crt"
35-
fi
3632
if ! is_empty "$SENTINEL_PASSWORD"; then
37-
cmd="redis-cli -h localhost -p $sentinel_service_port -a $SENTINEL_PASSWORD $tls_cmd ping"
33+
cmd="redis-cli -h localhost -p $sentinel_service_port -a $SENTINEL_PASSWORD $REDIS_CLI_TLS_CMD ping"
3834
else
39-
cmd="redis-cli -h localhost -p $sentinel_service_port $tls_cmd ping"
35+
cmd="redis-cli -h localhost -p $sentinel_service_port $REDIS_CLI_TLS_CMD ping"
4036
fi
4137
response=$($cmd)
4238
status=$?

‎addons/redis/scripts/redis-sentinel-post-start.sh‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,9 @@ acl_set_user_for_redis_sentinel() {
3030
# set default user password and replication user password
3131
if [ -n "$SENTINEL_PASSWORD" ]; then
3232
sentinel_service_port=${SENTINEL_SERVICE_PORT:-26379}
33-
tls_cmd=""
34-
if [ "$TLS_ENABLED" == "true" ]; then
35-
tls_cmd="--tls --cacert ${TLS_MOUNT_PATH}/ca.crt"
36-
fi
37-
until redis-cli -h localhost -p $sentinel_service_port -a $SENTINEL_PASSWORD $tls_cmd ping; do sleep 1; done
38-
redis-cli -h localhost -p $sentinel_service_port -a $SENTINEL_PASSWORD $tls_cmd ACL SETUSER $SENTINEL_USER ON \>$SENTINEL_PASSWORD allchannels +@all
39-
redis-cli -h localhost -p $sentinel_service_port -a $SENTINEL_PASSWORD $tls_cmd ACL SAVE
33+
until redis-cli -h localhost -p $sentinel_service_port -a $SENTINEL_PASSWORD $REDIS_CLI_TLS_CMD ping; do sleep 1; done
34+
redis-cli -h localhost -p $sentinel_service_port -a $SENTINEL_PASSWORD $REDIS_CLI_TLS_CMD ACL SETUSER $SENTINEL_USER ON \>$SENTINEL_PASSWORD allchannels +@all
35+
redis-cli -h localhost -p $sentinel_service_port -a $SENTINEL_PASSWORD $REDIS_CLI_TLS_CMD ACL SAVE
4036
echo "redis sentinel user and password set successfully."
4137
fi
4238
}

0 commit comments

Comments
 (0)