disallow instance with older timestamp to update instance with newer … #5480
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
…timestamp Signed-off-by: Wen Xu <[email protected]>
Signed-off-by: Wen Xu <[email protected]>
… again Signed-off-by: Wen Xu <[email protected]>
Signed-off-by: Wen Xu <[email protected]>
pkg/ring/model.go
Outdated
Comment on lines
751
to
753
| if !tokensEqual(ing.Tokens, oing.Tokens) { | ||
| tokensChanged = true | ||
| } |
There was a problem hiding this comment.
We need to consider now that the tokens might not change if the timestamp is in the past. We should mark as tokensChanged only if we add the instance to toUpdate
There was a problem hiding this comment.
right, I agree. That will save us some resolveconflict executions. I'll make the change.
Signed-off-by: Wen Xu <[email protected]>
yeya24
approved these changes
Jul 31, 2023
rajagopalanand
pushed a commit
to rajagopalanand/rajagopalanand-cortex
that referenced
this pull request
Aug 3, 2023
cortexproject#5480) * disallow instance with older timestamp to update instance with newer timestamp Signed-off-by: Wen Xu <[email protected]> * add statement in changelog Signed-off-by: Wen Xu <[email protected]> * just update after resolve conflict in the token, no need to do checks again Signed-off-by: Wen Xu <[email protected]> * fix lint Signed-off-by: Wen Xu <[email protected]> * only try to resolve conflict tokens when there is update Signed-off-by: Wen Xu <[email protected]> --------- Signed-off-by: Wen Xu <[email protected]>
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.
What this PR does:
Background:
When we tried to switch from memberlist as primary and DDB as secondary KVStore, to DDB as primary and memberlist as secondary KV Store. We had encountered two issues.
We figured out, it was because
Now two things can happen, if the revert is before the next heartbeat of pod-1, pod-1 will be waiting for the instance to be in JOINING state forever, in this case, the pod get stuck in Leaving
If the revert happens after the next heartbeat of pod-1, when store-gateway finished its initial sync, it will set its state to ACTIVE. In this case, from Leaving to Active. IP will stay reverted in DDB.
To fix this issue, we check the timestamp during the update process, if the timestamp of the instance we tried to update is smaller than current timestamp of the instance, we skip the update. This will fix the issue.
Which issue(s) this PR fixes:
Fixes #
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]