Merge pull request #1115 from supercaracal/fix-test-settings-for-sent…

…inel Prevent to continue to wait for sentinels which not to recognize broken replications
redis · Aug 10, 2022 · ad7a0f9 · ad7a0f9
2 parents 1c7cd38 + 5648b67
commit ad7a0f9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/makefile b/makefile
@@ -82,14 +82,21 @@ start_sentinel: ${BINARY}
 			--sentinel;\
 	done
 
+wait_for_sentinel: MAX_ATTEMPTS_FOR_WAIT ?= 60
 wait_for_sentinel:
 	@for port in ${SENTINEL_PORTS}; do\
+		i=0;\
 		while : ; do\
+			if [ $${i} -ge ${MAX_ATTEMPTS_FOR_WAIT} ]; then\
+				echo "Max attempts exceeded: $${i} times";\
+				exit 1;\
+			fi;\
 			if [ $$(${REDIS_CLIENT} -p $${port} SENTINEL SLAVES ${HA_GROUP_NAME} | wc -l) -gt 1 ]; then\
 				break;\
 			fi;\
 			echo 'Waiting for Redis sentinel to be ready...';\
 			sleep 1;\
+			i=$$(( $${i}+1 ));\
 		done;\
 	done
 

diff --git a/test/support/conf/redis-5.0.conf b/test/support/conf/redis-5.0.conf
@@ -1,3 +1,2 @@
-slaveof no one
 appendonly no
 save ""
diff --git a/test/support/conf/redis-6.0.conf b/test/support/conf/redis-6.0.conf
@@ -1,3 +1,2 @@
-slaveof no one
 appendonly no
 save ""
diff --git a/test/support/conf/redis-6.2.conf b/test/support/conf/redis-6.2.conf
@@ -1,3 +1,2 @@
-slaveof no one
 appendonly no
 save ""
diff --git a/test/support/conf/redis-7.0.conf b/test/support/conf/redis-7.0.conf
@@ -1,4 +1,3 @@
-slaveof no one
 appendonly no
 save ""
 enable-debug-command yes