Skip to content

Commit a8ba2ef

Browse files
committed
fix bug
1 parent 78b1ce7 commit a8ba2ef

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

addons/redis/scripts-ut-spec/redis_register_to_sentinel_spec.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ Describe 'register_to_sentinel.sh'
134134
It 'constructs the sentinel down-after-milliseconds sub command correctly'
135135
When call construct_sentinel_sub_command "down-after-milliseconds" "redis-redis" "redis-redis-0.redis-redis.default.svc.cluster.local" "6379"
136136
The status should be success
137-
The output should eq "SENTINEL set redis-redis down-after-milliseconds 5000"
137+
The output should eq "SENTINEL set redis-redis down-after-milliseconds 20000"
138138
End
139139

140140
It 'constructs the sentinel failover-timeout sub command correctly'
@@ -192,7 +192,7 @@ Describe 'register_to_sentinel.sh'
192192
When call register_to_sentinel $sentinel_host $master_name $redis_primary_host $redis_primary_port
193193
The status should be success
194194
The output should include "host:redis-redis-sentinel-0.redis-redis-sentinel-headless.default.svc.cluster.local, port:26379 Command:SENTINEL monitor redis-redis redis-redis-0.redis-redis.default.svc.cluster.local 6379 2"
195-
The output should include "host:redis-redis-sentinel-0.redis-redis-sentinel-headless.default.svc.cluster.local, port:26379 Command:SENTINEL set redis-redis down-after-milliseconds 5000 executed successfully."
195+
The output should include "host:redis-redis-sentinel-0.redis-redis-sentinel-headless.default.svc.cluster.local, port:26379 Command:SENTINEL set redis-redis down-after-milliseconds 20000 executed successfully."
196196
The output should include "host:redis-redis-sentinel-0.redis-redis-sentinel-headless.default.svc.cluster.local, port:26379 Command:SENTINEL set redis-redis failover-timeout 60000"
197197
The output should include "host:redis-redis-sentinel-0.redis-redis-sentinel-headless.default.svc.cluster.local, port:26379 Command:SENTINEL set redis-redis parallel-syncs 1"
198198
The output should include "host:redis-redis-sentinel-0.redis-redis-sentinel-headless.default.svc.cluster.local, port:26379 Command:SENTINEL set redis-redis auth-user"

addons/redis/scripts-ut-spec/redis_sentinel_member_join_spec.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Describe "Redis Sentinel Member Join Script Tests"
7575
flags
7676
master
7777
down-after-milliseconds
78-
5000
78+
20000
7979
quorum
8080
2
8181
failover-timeout
@@ -87,7 +87,7 @@ Describe "Redis Sentinel Member Join Script Tests"
8787
The status should be success
8888
The stdout should include "all masters are reachable"
8989
The contents of file "$redis_sentinel_real_conf" should include "sentinel monitor mymaster 172.20.0.1 30746 2"
90-
The contents of file "$redis_sentinel_real_conf" should include "sentinel down-after-milliseconds mymaster 5000"
90+
The contents of file "$redis_sentinel_real_conf" should include "sentinel down-after-milliseconds mymaster 20000"
9191
The contents of file "$redis_sentinel_real_conf" should include "sentinel failover-timeout mymaster 60000"
9292
The contents of file "$redis_sentinel_real_conf" should include "sentinel parallel-syncs mymaster 1"
9393
The contents of file "$redis_sentinel_real_conf" should include "sentinel auth-user mymaster $REDIS_SENTINEL_USER"
@@ -138,7 +138,7 @@ Describe "Redis Sentinel Member Join Script Tests"
138138
flags
139139
master
140140
down-after-milliseconds
141-
5000
141+
20000
142142
quorum
143143
2
144144
failover-timeout
@@ -154,7 +154,7 @@ Describe "Redis Sentinel Member Join Script Tests"
154154
flags
155155
master
156156
down-after-milliseconds
157-
5000
157+
20000
158158
quorum
159159
2
160160
failover-timeout
@@ -166,13 +166,13 @@ Describe "Redis Sentinel Member Join Script Tests"
166166
The status should be success
167167
The stdout should include "all masters are reachable"
168168
The contents of file "$redis_sentinel_real_conf" should include "sentinel monitor redis-redis0 172.20.0.1 30746 2"
169-
The contents of file "$redis_sentinel_real_conf" should include "sentinel down-after-milliseconds redis-redis0 5000"
169+
The contents of file "$redis_sentinel_real_conf" should include "sentinel down-after-milliseconds redis-redis0 20000"
170170
The contents of file "$redis_sentinel_real_conf" should include "sentinel failover-timeout redis-redis0 60000"
171171
The contents of file "$redis_sentinel_real_conf" should include "sentinel parallel-syncs redis-redis0 1"
172172
The contents of file "$redis_sentinel_real_conf" should include "sentinel auth-user redis-redis0 $REDIS_SENTINEL_USER"
173173
The contents of file "$redis_sentinel_real_conf" should include "sentinel auth-pass redis-redis0 $REDIS_SENTINEL_PASSWORD_REDIS0"
174174
The contents of file "$redis_sentinel_real_conf" should include "sentinel monitor redis-redis1 172.20.0.2 30747 2"
175-
The contents of file "$redis_sentinel_real_conf" should include "sentinel down-after-milliseconds redis-redis1 5000"
175+
The contents of file "$redis_sentinel_real_conf" should include "sentinel down-after-milliseconds redis-redis1 20000"
176176
The contents of file "$redis_sentinel_real_conf" should include "sentinel failover-timeout redis-redis1 60000"
177177
The contents of file "$redis_sentinel_real_conf" should include "sentinel parallel-syncs redis-redis1 1"
178178
The contents of file "$redis_sentinel_real_conf" should include "sentinel auth-user redis-redis1 $REDIS_SENTINEL_USER"

0 commit comments

Comments
 (0)