Skip to content
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.

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

Avoid concurrency between heartbeat and autoJoin #5438

Merged
merged 1 commit into from
Jun 29, 2023

Conversation

danielblando
Copy link
Contributor

@danielblando danielblando commented Jun 29, 2023

What this PR does:
Add a min value to jitter delay.
Improve flake test

Which issue(s) this PR fixes:
On #5404 while adding jitter to heartbeat, we increased the chance of a concurrency issue between autoJoin and heartbeat. We do have in some cases where autoJoin fails and need to retry situations where a instance can go to ACTIVE with no tokens.
On #5428, we try to mitigate it by also synicng the tokens, but this can create performance overhead when we have conflict tokens between instances.
We are here adding a min value for the jitter to avoid concurrency and braking tests.

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

Signed-off-by: Daniel Deluiggi <ddeluigg@amazon.com>
@danielblando danielblando marked this pull request as ready for review June 29, 2023 23:01
@alanprot alanprot merged commit 8be7a44 into cortexproject:master Jun 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants