From c4f0369cbddc7e55ec0328ab2fb916eda8cdb94f Mon Sep 17 00:00:00 2001 From: Robert Cardell Date: Wed, 18 Jan 2023 09:52:14 +0000 Subject: [PATCH 1/2] Fix the check for running sentinels --- operator/redisfailover/service/check.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operator/redisfailover/service/check.go b/operator/redisfailover/service/check.go index b65c782b2..bad5eeb51 100644 --- a/operator/redisfailover/service/check.go +++ b/operator/redisfailover/service/check.go @@ -483,7 +483,7 @@ func (r *RedisFailoverChecker) IsRedisRunning(rFailover *redisfailoverv1.RedisFa // IsSentinelRunning returns true if all the pods are Running func (r *RedisFailoverChecker) IsSentinelRunning(rFailover *redisfailoverv1.RedisFailover) bool { dp, err := r.k8sService.GetDeploymentPods(rFailover.Namespace, GetSentinelName(rFailover)) - return err == nil && len(dp.Items) > int(rFailover.Spec.Redis.Replicas-1) && AreAllRunning(dp) + return err == nil && len(dp.Items) > int(rFailover.Spec.Sentinel.Replicas-1) && AreAllRunning(dp) } // IsClusterRunning returns true if all the pods in the given redisfailover are Running From 19b16b2d36470f538dd6c6cf70b321f40243d6cf Mon Sep 17 00:00:00 2001 From: Robert Cardell Date: Wed, 18 Jan 2023 09:53:38 +0000 Subject: [PATCH 2/2] Fix spelling error in readiness check script --- operator/redisfailover/service/generator.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operator/redisfailover/service/generator.go b/operator/redisfailover/service/generator.go index 3a98d8fa6..8a16fe7d1 100644 --- a/operator/redisfailover/service/generator.go +++ b/operator/redisfailover/service/generator.go @@ -250,7 +250,7 @@ case $role in check_slave ;; *) - echo "unespected" + echo "unexpected" exit 1 esac`, port)