Skip to content

Remove remaining support for denormalised tokens in the ring. #2034

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

Merged
merged 12 commits into from
Jan 28, 2020
Merged

Remove remaining support for denormalised tokens in the ring. #2034

merged 12 commits into from
Jan 28, 2020

Conversation

pstibrany
Copy link
Contributor

@pstibrany pstibrany commented Jan 25, 2020

This PR removes remaining support for denormalised tokens in the ring.

Targeted for post 0.6 release.

Reason for this change is to simplify the code. Nobody should be using denormalised tokens anymore, we have provided smooth upgrade path (post 0.4.0 Cortex only writes normalised tokens).

As we don't expect to run a mix of old (with old fields in ring protobuf) and new (with some new field with the same number) Cortex versions in practice, I've removed reserved fields from ring protobuf and also didn't reserve number for just-removed Tokens field.

Checklist

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

Signed-off-by: Peter Štibraný <[email protected]>
Signed-off-by: Peter Štibraný <[email protected]>
Signed-off-by: Peter Štibraný <[email protected]>
Signed-off-by: Peter Štibraný <[email protected]>
Signed-off-by: Peter Štibraný <[email protected]>
Copy link
Contributor

@jtlisi jtlisi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, looks pretty straightforward

We don't expect to run a mix of old (with old fields) and new
(with new field with the same number) Cortex versions in practice.

Signed-off-by: Peter Štibraný <[email protected]>
Copy link
Contributor

@pracucci pracucci left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Peter! The cleanup LGTM. I've also manually tested the ingester transfer. Would you mind taking a look at the few comments left, please?

Signed-off-by: Peter Štibraný <[email protected]>
Signed-off-by: Peter Štibraný <[email protected]>
Signed-off-by: Peter Štibraný <[email protected]>
@pstibrany
Copy link
Contributor Author

pstibrany commented Jan 28, 2020

Thank you both for your reviews. I've addressed (hopefully all) your feedback.

The cleanup LGTM. I've also manually tested the ingester transfer.

Btw, we have integration test doing this already (it found some bugs in my code in the past).

Copy link
Contributor

@pracucci pracucci left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@pracucci pracucci merged commit b4a27d9 into cortexproject:master Jan 28, 2020
@pstibrany pstibrany deleted the remove-denormalised-tokens branch January 28, 2020 11:50
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.

3 participants