Skip to content
This repository was archived by the owner on Oct 10, 2026. It is now read-only.

Commit 5c14bfb

Browse files
committed
fix(client): separate local dial port from upstream master port
Address review feedback from coderabbitai on service/redis/client.go:290: MakeSlaveOfWithPort dialed the local Redis instance at net.JoinHostPort(ip, masterPort) and sent SLAVEOF masterIP masterPort, collapsing two distinct ports into one. In same-cluster failover the two are equal so the bug was dormant, but SetExternalMasterOnAll threads the external master's port through this API — when that port differs from the local Redis port the operator dials the local pod on the wrong port and the slave-of reconfig fails for every external master takeover. The function now takes localPort and masterPort as independent arguments: the dial uses ip:localPort, the SLAVEOF command keeps masterIP:masterPort. SetExternalMasterOnAll resolves localPort from spec.Redis.Port before iterating pods; the same-cluster callers (SetOldestAsMaster, SetMasterOnAll) pass the same port for both values since their masterPort always equals localPort. This supersedes the original WONTFIX on PR #1 review thread 12 — the fix turned out cheap enough to fold into the TLS branch rather than defer. Signed-off-by: Arsolitt <[email protected]>
1 parent ab21527 commit 5c14bfb

4 files changed

Lines changed: 25 additions & 19 deletions

File tree

‎mocks/service/redis/Client.go‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎operator/redisfailover/service/heal.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ func (r *RedisFailoverHealer) SetOldestAsMaster(rf *redisfailoverv1.RedisFailove
134134
newMasterIP = pod.Status.PodIP
135135
} else {
136136
r.logger.Infof("Making pod %s slave of %s", pod.Name, newMasterIP)
137-
if err := r.redisClient.MakeSlaveOfWithPort(pod.Status.PodIP, newMasterIP, port, password, tlsConfig); err != nil {
137+
if err := r.redisClient.MakeSlaveOfWithPort(pod.Status.PodIP, port, newMasterIP, port, password, tlsConfig); err != nil {
138138
r.logger.WithField("redisfailover", rf.ObjectMeta.Name).WithField("namespace", rf.ObjectMeta.Namespace).Errorf("Make slave failed, slave pod ip: %s, master ip: %s, error: %v", pod.Status.PodIP, newMasterIP, err)
139139
}
140140

@@ -179,7 +179,7 @@ func (r *RedisFailoverHealer) SetMasterOnAll(masterIP string, rf *redisfailoverv
179179
continue
180180
}
181181
r.logger.WithField("redisfailover", rf.ObjectMeta.Name).WithField("namespace", rf.ObjectMeta.Namespace).Infof("Making pod %s slave of %s", pod.Name, masterIP)
182-
if err := r.redisClient.MakeSlaveOfWithPort(pod.Status.PodIP, masterIP, port, password, tlsConfig); err != nil {
182+
if err := r.redisClient.MakeSlaveOfWithPort(pod.Status.PodIP, port, masterIP, port, password, tlsConfig); err != nil {
183183
r.logger.WithField("redisfailover", rf.ObjectMeta.Name).WithField("namespace", rf.ObjectMeta.Namespace).Errorf("Make slave failed, slave ip: %s, master ip: %s, error: %v", pod.Status.PodIP, masterIP, err)
184184
return err
185185
}
@@ -210,9 +210,10 @@ func (r *RedisFailoverHealer) SetExternalMasterOnAll(masterIP, masterPort string
210210
return err
211211
}
212212

213+
localPort := getRedisPort(rf.Spec.Redis.Port)
213214
for _, pod := range ssp.Items {
214215
r.logger.WithField("redisfailover", rf.ObjectMeta.Name).WithField("namespace", rf.ObjectMeta.Namespace).Infof("Making pod %s slave of %s:%s", pod.Name, masterIP, masterPort)
215-
if err := r.redisClient.MakeSlaveOfWithPort(pod.Status.PodIP, masterIP, masterPort, password, tlsConfig); err != nil {
216+
if err := r.redisClient.MakeSlaveOfWithPort(pod.Status.PodIP, localPort, masterIP, masterPort, password, tlsConfig); err != nil {
216217
return err
217218
}
218219

‎operator/redisfailover/service/heal_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ func TestSetOldestAsMasterMultiplePodsMakeSlaveOfError(t *testing.T) {
9696
ms.On("UpdatePodLabels", namespace, mock.AnythingOfType("string"), mock.Anything).Return(nil)
9797
mr := &mRedisService.Client{}
9898
mr.On("MakeMaster", "0.0.0.0", "0", "", mock.Anything).Once().Return(nil)
99-
mr.On("MakeSlaveOfWithPort", "1.1.1.1", "0.0.0.0", "0", "", mock.Anything).Once().Return(errors.New(""))
99+
mr.On("MakeSlaveOfWithPort", "1.1.1.1", "0", "0.0.0.0", "0", "", mock.Anything).Once().Return(errors.New(""))
100100

101101
healer := rfservice.NewRedisFailoverHealer(ms, mr, log.DummyLogger{})
102102

@@ -129,7 +129,7 @@ func TestSetOldestAsMasterMultiplePods(t *testing.T) {
129129
ms.On("UpdatePodLabels", namespace, mock.AnythingOfType("string"), mock.Anything).Return(nil)
130130
mr := &mRedisService.Client{}
131131
mr.On("MakeMaster", "0.0.0.0", "0", "", mock.Anything).Once().Return(nil)
132-
mr.On("MakeSlaveOfWithPort", "1.1.1.1", "0.0.0.0", "0", "", mock.Anything).Once().Return(nil)
132+
mr.On("MakeSlaveOfWithPort", "1.1.1.1", "0", "0.0.0.0", "0", "", mock.Anything).Once().Return(nil)
133133

134134
healer := rfservice.NewRedisFailoverHealer(ms, mr, log.DummyLogger{})
135135

@@ -172,7 +172,7 @@ func TestSetOldestAsMasterOrdering(t *testing.T) {
172172
ms.On("UpdatePodLabels", namespace, mock.AnythingOfType("string"), mock.Anything).Return(nil)
173173
mr := &mRedisService.Client{}
174174
mr.On("MakeMaster", "1.1.1.1", "0", "", mock.Anything).Once().Return(nil)
175-
mr.On("MakeSlaveOfWithPort", "0.0.0.0", "1.1.1.1", "0", "", mock.Anything).Once().Return(nil)
175+
mr.On("MakeSlaveOfWithPort", "0.0.0.0", "0", "1.1.1.1", "0", "", mock.Anything).Once().Return(nil)
176176

177177
healer := rfservice.NewRedisFailoverHealer(ms, mr, log.DummyLogger{})
178178

@@ -236,7 +236,7 @@ func TestSetMasterOnAllMakeSlaveOfError(t *testing.T) {
236236
ms.On("UpdatePodLabels", namespace, mock.AnythingOfType("string"), mock.Anything).Return(nil)
237237
mr := &mRedisService.Client{}
238238
mr.On("IsMaster", "0.0.0.0", "0", "", mock.Anything).Return(true, nil)
239-
mr.On("MakeSlaveOfWithPort", "1.1.1.1", "0.0.0.0", "0", "", mock.Anything).Once().Return(errors.New(""))
239+
mr.On("MakeSlaveOfWithPort", "1.1.1.1", "0", "0.0.0.0", "0", "", mock.Anything).Once().Return(errors.New(""))
240240

241241
healer := rfservice.NewRedisFailoverHealer(ms, mr, log.DummyLogger{})
242242

@@ -269,7 +269,7 @@ func TestSetMasterOnAll(t *testing.T) {
269269
ms.On("UpdatePodLabels", namespace, mock.AnythingOfType("string"), mock.Anything).Return(nil)
270270
mr := &mRedisService.Client{}
271271
mr.On("IsMaster", "0.0.0.0", "0", "", mock.Anything).Return(true, nil)
272-
mr.On("MakeSlaveOfWithPort", "1.1.1.1", "0.0.0.0", "0", "", mock.Anything).Once().Return(nil)
272+
mr.On("MakeSlaveOfWithPort", "1.1.1.1", "0", "0.0.0.0", "0", "", mock.Anything).Once().Return(nil)
273273

274274
healer := rfservice.NewRedisFailoverHealer(ms, mr, log.DummyLogger{})
275275

@@ -327,12 +327,12 @@ func TestSetExternalMasterOnAll(t *testing.T) {
327327

328328
mr := &mRedisService.Client{}
329329
if !expectError {
330-
mr.On("MakeSlaveOfWithPort", "0.0.0.0", "5.5.5.5", "6379", "", mock.Anything).Once().Return(nil)
330+
mr.On("MakeSlaveOfWithPort", "0.0.0.0", "0", "5.5.5.5", "6379", "", mock.Anything).Once().Return(nil)
331331
if test.errorOnMakeSlaveOf {
332332
expectError = true
333-
mr.On("MakeSlaveOfWithPort", "1.1.1.1", "5.5.5.5", "6379", "", mock.Anything).Once().Return(errors.New(""))
333+
mr.On("MakeSlaveOfWithPort", "1.1.1.1", "0", "5.5.5.5", "6379", "", mock.Anything).Once().Return(errors.New(""))
334334
} else {
335-
mr.On("MakeSlaveOfWithPort", "1.1.1.1", "5.5.5.5", "6379", "", mock.Anything).Once().Return(nil)
335+
mr.On("MakeSlaveOfWithPort", "1.1.1.1", "0", "5.5.5.5", "6379", "", mock.Anything).Once().Return(nil)
336336
}
337337
}
338338

‎service/redis/client.go‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ type Client interface {
3333
MonitorRedisWithPort(ip, monitor, port, quorum, password string, tlsConfig *tls.Config) error
3434
MakeMaster(ip, port, password string, tlsConfig *tls.Config) error
3535
MakeSlaveOf(ip, masterIP, password string, tlsConfig *tls.Config) error
36-
MakeSlaveOfWithPort(ip, masterIP, masterPort, password string, tlsConfig *tls.Config) error
36+
MakeSlaveOfWithPort(ip, localPort, masterIP, masterPort, password string, tlsConfig *tls.Config) error
3737
GetSentinelMonitor(ip string, tlsConfig *tls.Config) (string, string, error)
3838
SetCustomSentinelConfig(ip string, configs []string, tlsConfig *tls.Config) error
3939
SetCustomRedisConfig(ip string, port string, configs []string, password string, tlsConfig *tls.Config) error
@@ -279,12 +279,17 @@ func (c *client) MakeMaster(ip string, port string, password string, tlsConfig *
279279
}
280280

281281
func (c *client) MakeSlaveOf(ip, masterIP, password string, tlsConfig *tls.Config) error {
282-
return c.MakeSlaveOfWithPort(ip, masterIP, redisPort, password, tlsConfig)
282+
return c.MakeSlaveOfWithPort(ip, redisPort, masterIP, redisPort, password, tlsConfig)
283283
}
284284

285-
func (c *client) MakeSlaveOfWithPort(ip, masterIP, masterPort, password string, tlsConfig *tls.Config) error {
285+
// MakeSlaveOfWithPort dials the local Redis instance at ip:localPort and
286+
// instructs it to replicate from masterIP:masterPort. The two ports must
287+
// be passed independently because external-master mode (where masterPort
288+
// belongs to a Redis outside the cluster) and same-cluster failover
289+
// (where masterPort equals localPort) both flow through this function.
290+
func (c *client) MakeSlaveOfWithPort(ip, localPort, masterIP, masterPort, password string, tlsConfig *tls.Config) error {
286291
options := &rediscli.Options{
287-
Addr: net.JoinHostPort(ip, masterPort), // this is IP and Port for the RedisFailover redis
292+
Addr: net.JoinHostPort(ip, localPort),
288293
Password: password,
289294
DB: 0,
290295
TLSConfig: tlsConfig,

0 commit comments

Comments
 (0)