Skip to content

[GOG-1162] Fix Cluster Health Check to Skip HAProxy Validation in Bootstrap Mode #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rurkss merged 2 commits into from
Jul 16, 2025
Merged

[GOG-1162] Fix Cluster Health Check to Skip HAProxy Validation in Bootstrap Mode #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b47da49
fix cluster state check
rurkss Jul 15, 2025
7c900a0
adding test for clusterisrunning with haproxy is optional
rurkss Jul 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions operator/redisfailover/service/check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,12 +516,19 @@ func (r *RedisFailoverChecker) IsHAProxyRunning(rFailover *redisfailoverv1.Redis
return err == nil && len(dp.Items) > int(rFailover.Spec.Haproxy.Replicas-1) && AreAllRunning(dp, int(rFailover.Spec.Haproxy.Replicas))
}

// IsClusterRunning returns true if all the pods in the given redisfailover are Running
func (r *RedisFailoverChecker) IsClusterRunning(rFailover *redisfailoverv1.RedisFailover) bool {
if rFailover.Bootstrapping() && !rFailover.SentinelsAllowed() {
return r.IsRedisRunning(rFailover) && r.IsHAProxyRunning(rFailover)
// IsClusterRunning returns true if all the pods in the given RedisFailover are running.
func (r *RedisFailoverChecker) IsClusterRunning(rf *redisfailoverv1.RedisFailover) bool {
if rf.Bootstrapping() {
if !rf.SentinelsAllowed() {
return r.IsRedisRunning(rf)
}
return r.IsRedisRunning(rf) && r.IsSentinelRunning(rf)
}
return r.IsSentinelRunning(rFailover) && r.IsRedisRunning(rFailover) && r.IsHAProxyRunning(rFailover)

// In normal mode, Redis, Sentinel, and HAProxy must all be running
return r.IsRedisRunning(rf) &&
r.IsSentinelRunning(rf) &&
r.IsHAProxyRunning(rf)
}

func AreAllRunning(pods *corev1.PodList, expectedRunningPods int) bool {
Expand Down
25 changes: 23 additions & 2 deletions operator/redisfailover/service/check_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ func generateRF() *redisfailoverv1.RedisFailover {
Replicas: int32(3),
Port: redisfailoverv1.Port(26379),
},
Haproxy: &redisfailoverv1.HaproxySettings{
Replicas: int32(3),
},
},
}
}
Expand Down Expand Up @@ -983,23 +986,39 @@ func TestClusterRunning(t *testing.T) {
},
}

mr := &mRedisService.Client{}

ms := &mK8SService.Services{}
ms.On("GetDeploymentPods", namespace, rfservice.GetSentinelName(rf)).Once().Return(allRunning, nil)
ms.On("GetStatefulSetPods", namespace, rfservice.GetRedisName(rf)).Once().Return(allRunning, nil)
mr := &mRedisService.Client{}

ms.On("GetDeploymentPods", namespace, rfservice.GetHaproxyMasterName(rf)).Once().Return(allRunning, nil)
checker := rfservice.NewRedisFailoverChecker(ms, mr, log.DummyLogger{}, metrics.Dummy)

assert.True(checker.IsClusterRunning(rf))

ms = &mK8SService.Services{}
ms.On("GetDeploymentPods", namespace, rfservice.GetSentinelName(rf)).Once().Return(allRunning, nil)
ms.On("GetStatefulSetPods", namespace, rfservice.GetRedisName(rf)).Once().Return(notAllReplicas, nil)
ms.On("GetDeploymentPods", namespace, rfservice.GetHaproxyMasterName(rf)).Once().Return(allRunning, nil)
checker = rfservice.NewRedisFailoverChecker(ms, mr, log.DummyLogger{}, metrics.Dummy)

assert.False(checker.IsClusterRunning(rf))

ms = &mK8SService.Services{}
ms.On("GetDeploymentPods", namespace, rfservice.GetSentinelName(rf)).Once().Return(notAllRunning, nil)
ms.On("GetStatefulSetPods", namespace, rfservice.GetRedisName(rf)).Once().Return(allRunning, nil)
ms.On("GetDeploymentPods", namespace, rfservice.GetHaproxyMasterName(rf)).Once().Return(notAllReplicas, nil)
checker = rfservice.NewRedisFailoverChecker(ms, mr, log.DummyLogger{}, metrics.Dummy)

assert.False(checker.IsClusterRunning(rf))

rf.Spec.Haproxy = nil
ms = &mK8SService.Services{}
ms.On("GetDeploymentPods", namespace, rfservice.GetSentinelName(rf)).Once().Return(allRunning, nil)
ms.On("GetStatefulSetPods", namespace, rfservice.GetRedisName(rf)).Once().Return(allRunning, nil)
checker = rfservice.NewRedisFailoverChecker(ms, mr, log.DummyLogger{}, metrics.Dummy)

assert.True(checker.IsClusterRunning(rf))
}

func TestClusterRunningWithBootstrap(t *testing.T) {
Expand Down Expand Up @@ -1090,6 +1109,8 @@ func TestClusterRunningWithBootstrap(t *testing.T) {

ms.On("GetDeploymentPods", namespace, rfservice.GetSentinelName(rf)).Once().Return(notAllRunning, nil)
ms.On("GetStatefulSetPods", namespace, rfservice.GetRedisName(rf)).Once().Return(allRunning, nil)
ms.On("GetDeploymentPods", namespace, rfservice.GetHaproxyMasterName(rf)).Once().Return(allRunning, nil)

assert.True(checker.IsClusterRunning(rf))
}

Expand Down
Loading