-
Notifications
You must be signed in to change notification settings - Fork 3.4k
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
Loki: Add a ring to the query scheduler to allow discovery via the ring as an alternative to DNS #4424
Merged
Merged
Loki: Add a ring to the query scheduler to allow discovery via the ring as an alternative to DNS #4424
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
fd22a6c
Fork the frontend and scheduler so we can add support for discovery v…
slim-bean d6e149f
Add a ring to the query scheduler which is then used by the frontend …
slim-bean 21d72da
update some of the forked code to use dskit grpcclient and grpcutil s…
slim-bean ddb204b
remove query scheduler dependency from querier
trevorwhitney 4b919ad
migrate logging package and make linter happy
trevorwhitney 52ca38f
add SafeReadRing for instances when scheduler is not enabled on same …
trevorwhitney b164090
Doc changes from code review
trevorwhitney 9a396c8
go mod tidy on go-kit dep
trevorwhitney b443179
update changelog
trevorwhitney 2553167
remove ReadRing in favor of SafeReadRing
trevorwhitney File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -73,14 +73,22 @@ func (c *ConfigWrapper) ApplyDynamicConfig() cfg.Source { | |
} | ||
} | ||
|
||
// If nobody has defined any frontend address or scheduler address | ||
// we can default to using the query scheduler ring for scheduler discovery. | ||
if r.Worker.FrontendAddress == "" && | ||
r.Worker.SchedulerAddress == "" && | ||
r.Frontend.FrontendV2.SchedulerAddress == "" { | ||
r.QueryScheduler.UseSchedulerRing = true | ||
} | ||
|
||
applyMemberlistConfig(r) | ||
applyStorageConfig(r, &defaults) | ||
|
||
return nil | ||
} | ||
} | ||
|
||
// applyMemberlistConfig will change the default ingester, distributor, and ruler ring configurations to use memberlist | ||
// applyMemberlistConfig will change the default ingester, distributor, ruler, and query scheduler ring configurations to use memberlist | ||
// if the -memberlist.join_members config is provided. The idea here is that if a user explicitly configured the | ||
// memberlist configuration section, they probably want to be using memberlist for all their ring configurations. | ||
// Since a user can still explicitly override a specific ring configuration (for example, use consul for the distributor), | ||
|
@@ -90,6 +98,7 @@ func applyMemberlistConfig(r *ConfigWrapper) { | |
r.Ingester.LifecyclerConfig.RingConfig.KVStore.Store = memberlistStr | ||
r.Distributor.DistributorRing.KVStore.Store = memberlistStr | ||
r.Ruler.Ring.KVStore.Store = memberlistStr | ||
r.QueryScheduler.SchedulerRing.KVStore.Store = memberlistStr | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. could we add a quick test for this in |
||
} | ||
} | ||
|
||
|
This file contains 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
This file contains 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
This file contains 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
could we add a quick test for this in
config_wrapper_test.go
?