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.

Sign up for GitHub

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

Jump to bottom

Upgrade dskit and pass empty service name to dskit/grpcutil.Resolver.Resolve #4601

Merged
merged 1 commit into from
Jan 10, 2022
Merged

Upgrade dskit and pass empty service name to dskit/grpcutil.Resolver.Resolve #4601

merged 1 commit into from
Jan 10, 2022

Conversation

aknuds1
Copy link
Contributor

@aknuds1 aknuds1 commented Jan 5, 2022 •
edited
Loading

What this PR does:
Upgrade to dskit@01ce9286d7d5, which most importantly takes a new argument, service, to dskit/grpcutil.Resolver.Resolve. This argument configures the service part of the SRV DNS record to try and resolve. The PR passes an empty string for the aforementioned argument, so SRV lookup is disabled.

Which issue(s) this PR fixes:

Checklist

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

@aknuds1 aknuds1 marked this pull request as ready for review January 5, 2022 15:54
@aknuds1 aknuds1 changed the title Upgrade to latest dskit and pass empty service name to dskit/grpcutil.Resolver.Resolve Upgrade dskit and pass empty service name to dskit/grpcutil.Resolver.Resolve Jan 5, 2022
@aknuds1
Copy link
Contributor Author

aknuds1 commented Jan 5, 2022

I think the integration tests might be running with an older version of Go, since os.ReadFile isn't available?

@bboreham bboreham mentioned this pull request Jan 5, 2022
Closed
@pstibrany pstibrany mentioned this pull request Jan 6, 2022
Merged
@pstibrany
Copy link
Contributor

Can we please update dskit to latest main, there are more incompatible changes (removal of ring keys from dskit), it would be best to tackle them all at once. WDYT?

bboreham
bboreham reviewed Jan 6, 2022
View reviewed changes
CHANGELOG.md Outdated
@@ -76,7 +76,7 @@
* [BUGFIX] Querier: honor querier minT,maxT if `nil` SelectHints are passed to Select(). #4413
* [BUGFIX] Compactor: fixed panic while collecting Prometheus metrics. #4483
* [BUGFIX] Update go-kit package to fix spurious log messages #4544

* [BUGFIX] Querier: Disable query scheduler SRV DNS lookup. #4601
Copy link
Contributor

Choose a reason for hiding this comment

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

If I imagine myself as a Cortex admin, reading this, I don't think I would know whether it matters to me.
I think the effect was to reduce some noise in logs?
Looks like we also reduced some "connection refused" messages, and reworded some other log lines from the memberlist wrapper.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@bboreham good point, I can try to improve the changelog entry. I'm not so familiar with the other changes in dskit, I guess I ought to try to summarize them also?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've expanded upon this changelog entry, and added ones from dskit @pstibrany thought were useful.

@aknuds1
Copy link
Contributor Author

aknuds1 commented Jan 6, 2022

Can we please update dskit to latest main, there are more incompatible changes (removal of ring keys from dskit), it would be best to tackle them all at once. WDYT?

@pstibrany is it best to tackle that also in this PR? I honestly am not sure how to tackle those changes. If it's easily done I don't mind.

@pstibrany
Copy link
Contributor

Can we please update dskit to latest main, there are more incompatible changes (removal of ring keys from dskit), it would be best to tackle them all at once. WDYT?

@pstibrany is it best to tackle that also in this PR? I honestly am not sure how to tackle those changes. If it's easily done I don't mind.

It's relatively easy to do, we just need to stop using constants from dskit, and define them in Cortex. I will give you a pointer via Slack.

@aknuds1
Copy link
Contributor Author

aknuds1 commented Jan 6, 2022

Thanks @pstibrany, coming up.

@aknuds1 aknuds1 force-pushed the chore/upgrade-dskit branch 3 times, most recently from 142d6e5 to a358047 Compare January 6, 2022 13:40
@aknuds1
Copy link
Contributor Author

aknuds1 commented Jan 6, 2022

@pstibrany upgraded to latest dskit as you asked. @bboreham wrote more on the changelog entry, plus added the ones @pstibrany thought were useful from the dskit changelog.

@aknuds1 aknuds1 requested a review from bboreham January 6, 2022 13:41
@aknuds1 aknuds1 force-pushed the chore/upgrade-dskit branch 3 times, most recently from fdb8a2e to ae64450 Compare January 6, 2022 16:21
@pull-request-size pull-request-size bot added size/XL and removed size/L labels Jan 6, 2022
pstibrany
pstibrany approved these changes Jan 7, 2022
View reviewed changes
Copy link
Contributor

@pstibrany pstibrany left a comment

Choose a reason for hiding this comment

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

Good job, thank you!

@aknuds1
Upgrade to dskit@01ce9286d7d5
1f32bad 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
56quarters
56quarters approved these changes Jan 7, 2022
View reviewed changes
Copy link
Contributor

@56quarters 56quarters 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 approved these changes Jan 10, 2022
View reviewed changes
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, thanks!

@pracucci pracucci merged commit e0807c4 into cortexproject:master Jan 10, 2022
@aknuds1 aknuds1 deleted the chore/upgrade-dskit branch January 10, 2022 09:46
alvinlin123 pushed a commit to ac1214/cortex that referenced this pull request Jan 14, 2022
@aknuds1 @alvinlin123
Upgrade to dskit@01ce9286d7d5 (cortexproject#4601)
77e5a2b 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
Signed-off-by: Alvin Lin <alvinlin@amazon.com>
@marianafranco marianafranco mentioned this pull request Mar 8, 2022
Closed
2 tasks
@friedrich-at-adobe friedrich-at-adobe mentioned this pull request May 10, 2022
Merged
3 tasks
alanprot pushed a commit that referenced this pull request May 11, 2022
@friedrich-at-adobe
Include changelog number for #4499 #4601 #4707 #4708 (#4737)
454da6c 
Signed-off-by: Friedrich Gonzalez <fgonzale@adobe.com>
@budwing budwing mentioned this pull request Nov 4, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pstibrany pstibrany pstibrany approved these changes

@56quarters 56quarters 56quarters approved these changes

@pracucci pracucci pracucci approved these changes

@bboreham bboreham Awaiting requested review from bboreham

Assignees
No one assigned
Labels
size/XL
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@aknuds1 @pstibrany @56quarters @pracucci @bboreham