Skip to content

Fix ingester startup with a normalised ring#1464

Merged
bboreham merged 5 commits intomasterfrom
normalised-ingester-startup
Jun 18, 2019
Merged

Fix ingester startup with a normalised ring#1464
bboreham merged 5 commits intomasterfrom
normalised-ingester-startup

Conversation

@bboreham
Copy link
Contributor

Fixes #1311

Signed-off-by: Bryan Boreham <bryan@weave.works>
@csmarchbanks
Copy link
Contributor

Code looks good, but would it be possible to add a test case in/similar to TestRingNormaliseMigration?

bboreham added 2 commits June 17, 2019 06:46
Signed-off-by: Bryan Boreham <bryan@weave.works>
Signed-off-by: Bryan Boreham <bryan@weave.works>
@bboreham bboreham force-pushed the normalised-ingester-startup branch from 436bfc6 to d5219f4 Compare June 17, 2019 06:49
bboreham added 2 commits June 17, 2019 12:55
Signed-off-by: Bryan Boreham <bryan@weave.works>
Signed-off-by: Bryan Boreham <bryan@weave.works>
@bboreham bboreham force-pushed the normalised-ingester-startup branch from d5219f4 to de92875 Compare June 17, 2019 15:27
@bboreham
Copy link
Contributor Author

I added a test which led me to realise my original approach was flawed.
New approach is to do the denormalise every time we need TokensFor() an ingester, which is in initRing() and autoJoin().
(and hence I realise autoJoin() didn't check for clashing tokens in normalised mode)

migrateRing() is now rather poorly named, but I felt we could move that later.

@bboreham bboreham merged commit a7cedef into master Jun 18, 2019
@tomwilkie tomwilkie deleted the normalised-ingester-startup branch July 31, 2019 11:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Ingester restart with -ingester.normalise-tokens on results in not-ready state

2 participants