Backport bugfix: update ring with new ip address when instance is los… #6869
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…t, rejoins, but heartbeat is disabled Signed-off-by: Charlie Le <charlie_le@apple.com>
3860026 to
d350ed8
Compare
Signed-off-by: Daniel Sabsay <sabsay@adobe.com> Co-authored-by: Daniel Sabsay <sabsay@adobe.com> Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>
| @@ -684,6 +684,9 @@ func (i *Lifecycler) initRing(ctx context.Context) error { | |||
|
|
|||
| level.Info(i.logger).Log("msg", "existing entry found in ring", "state", i.GetState(), "tokens", len(tokens), "ring", i.RingName) | |||
|
|
|||
| // Update the address if it has changed | |||
| instanceDesc.Addr = i.Addr | |||
There was a problem hiding this comment.
Should we up this with the if condition below?
There was a problem hiding this comment.
This is just a backport from what is in master. I would implement that suggestion, if needed, in a master PR.
There was a problem hiding this comment.
ah i see. agree, we can just do the improvement later on master
danielblando
approved these changes
Jul 17, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backporting 371b2af