This repository was archived by the owner on Oct 10, 2026. It is now read-only.
Repository navigation
Commit 5c14bfb
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
- operator/redisfailover/service
- service/redis
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
134 | 134 | | |
135 | 135 | | |
136 | 136 | | |
137 | | - | |
| 137 | + | |
138 | 138 | | |
139 | 139 | | |
140 | 140 | | |
| |||
179 | 179 | | |
180 | 180 | | |
181 | 181 | | |
182 | | - | |
| 182 | + | |
183 | 183 | | |
184 | 184 | | |
185 | 185 | | |
| |||
210 | 210 | | |
211 | 211 | | |
212 | 212 | | |
| 213 | + | |
213 | 214 | | |
214 | 215 | | |
215 | | - | |
| 216 | + | |
216 | 217 | | |
217 | 218 | | |
218 | 219 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
96 | 96 | | |
97 | 97 | | |
98 | 98 | | |
99 | | - | |
| 99 | + | |
100 | 100 | | |
101 | 101 | | |
102 | 102 | | |
| |||
129 | 129 | | |
130 | 130 | | |
131 | 131 | | |
132 | | - | |
| 132 | + | |
133 | 133 | | |
134 | 134 | | |
135 | 135 | | |
| |||
172 | 172 | | |
173 | 173 | | |
174 | 174 | | |
175 | | - | |
| 175 | + | |
176 | 176 | | |
177 | 177 | | |
178 | 178 | | |
| |||
236 | 236 | | |
237 | 237 | | |
238 | 238 | | |
239 | | - | |
| 239 | + | |
240 | 240 | | |
241 | 241 | | |
242 | 242 | | |
| |||
269 | 269 | | |
270 | 270 | | |
271 | 271 | | |
272 | | - | |
| 272 | + | |
273 | 273 | | |
274 | 274 | | |
275 | 275 | | |
| |||
327 | 327 | | |
328 | 328 | | |
329 | 329 | | |
330 | | - | |
| 330 | + | |
331 | 331 | | |
332 | 332 | | |
333 | | - | |
| 333 | + | |
334 | 334 | | |
335 | | - | |
| 335 | + | |
336 | 336 | | |
337 | 337 | | |
338 | 338 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
| 36 | + | |
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
| |||
279 | 279 | | |
280 | 280 | | |
281 | 281 | | |
282 | | - | |
| 282 | + | |
283 | 283 | | |
284 | 284 | | |
285 | | - | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
286 | 291 | | |
287 | | - | |
| 292 | + | |
288 | 293 | | |
289 | 294 | | |
290 | 295 | | |
| |||
0 commit comments