Add concurrency to the mergeQueryable #4065
Merged
Conversation
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
MichelHollands
approved these changes
Apr 12, 2021
stevesg
reviewed
Apr 12, 2021
pstibrany
reviewed
Apr 13, 2021
jtlisi
reviewed
Apr 16, 2021
simonswine
force-pushed
the
20210409_adopt_concurrency_merge_queryable
branch
3 times, most recently
from
e203f2b to
0fc0fcd
Compare
simonswine
commented
Apr 22, 2021
simonswine
force-pushed
the
20210409_adopt_concurrency_merge_queryable
branch
from
ff839dc to
82e9c65
Compare
pstibrany
reviewed
Apr 22, 2021
simonswine
force-pushed
the
20210409_adopt_concurrency_merge_queryable
branch
from
833a7f9 to
13acdf4
Compare
pstibrany
approved these changes
Apr 23, 2021
| q := mockTenantQuerier{tenant: tenantIDs[0], extraLabels: m.extraLabels} | ||
|
|
||
| // set warning if exists | ||
| if intf := ctx.Value(contextKeyWarningsByTenant); intf != nil { |
There was a problem hiding this comment.
Nit: I don't quite see why warnings and errors for tenants must be passed to mockTenantQueryableWithFilter via context, instead of having extra fields in that queryable.
There was a problem hiding this comment.
Valid point, have refactored the tests a bit in 4a10de0
|
@pstibrany thanks for your continued review 🤗, we should be there now. |
3 tasks
jtlisi
approved these changes
Apr 26, 2021
simonswine
force-pushed
the
20210409_adopt_concurrency_merge_queryable
branch
from
8c5a8f9 to
ffb1313
Compare
This should significantly parallelize tenant federation queries. This also extends aligns the error and warning wrapping and adds tests for those cases. Signed-off-by: Christian Simon <[email protected]>
Co-authored-by: Steve Simpson <[email protected]> Co-authored-by: Michel Hollands <[email protected]> Signed-off-by: Christian Simon <[email protected]>
* Avoid background goroutine receiving results * Propagate errGroup context * Improve documentation comments Signed-off-by: Christian Simon <[email protected]>
Signed-off-by: Christian Simon <[email protected]>
In the first instance the limit is hard-coded, but that might be an option that can configured. Signed-off-by: Christian Simon <[email protected]>
Signed-off-by: Christian Simon <[email protected]>
This is beneficial if the methods are not handling context cancellation themselves. Signed-off-by: Christian Simon <[email protected]>
Signed-off-by: Christian Simon <[email protected]>
Signed-off-by: Christian Simon <[email protected]>
Signed-off-by: Christian Simon <[email protected]>
Reuse queryable struct and avoid using the context for passing parameters around. Signed-off-by: Christian Simon <[email protected]>
Co-authored-by: Jacob Lisi <[email protected]> Signed-off-by: Christian Simon <[email protected]>
simonswine
force-pushed
the
20210409_adopt_concurrency_merge_queryable
branch
from
ffb1313 to
7fd543d
Compare
simonswine
added a commit
to simonswine/cortex
that referenced
this pull request
May 25, 2021
* Add concurrency to the mergeQueryable This should significantly parallelize tenant federation queries. This also extends aligns the error and warning wrapping and adds tests for those cases. Signed-off-by: Christian Simon <[email protected]> * Apply suggestions from code review Co-authored-by: Steve Simpson <[email protected]> Co-authored-by: Michel Hollands <[email protected]> Signed-off-by: Christian Simon <[email protected]> * Simplify concurrency of mergeDistinctStringSlice * Avoid background goroutine receiving results * Propagate errGroup context * Improve documentation comments Signed-off-by: Christian Simon <[email protected]> * Add changelog entry Signed-off-by: Christian Simon <[email protected]> * Limit maximum concurrency of mergeQueryable In the first instance the limit is hard-coded, but that might be an option that can configured. Signed-off-by: Christian Simon <[email protected]> * End job early if context already closed Signed-off-by: Christian Simon <[email protected]> * Handle context cancellation in concurrency.ForEach This is beneficial if the methods are not handling context cancellation themselves. Signed-off-by: Christian Simon <[email protected]> * Avoid using interface pointer Signed-off-by: Christian Simon <[email protected]> * Handle errors properly for storage.SeriesSet Signed-off-by: Christian Simon <[email protected]> * Improve warning and error message readability Signed-off-by: Christian Simon <[email protected]> * Simplify mockTenantQueryableWithFilter Reuse queryable struct and avoid using the context for passing parameters around. Signed-off-by: Christian Simon <[email protected]> * Improve wording on comment Co-authored-by: Jacob Lisi <[email protected]> Signed-off-by: Christian Simon <[email protected]> Co-authored-by: Steve Simpson <[email protected]> Co-authored-by: Michel Hollands <[email protected]> Co-authored-by: Jacob Lisi <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This should significantly parallelize tenant federation queries. This also extends and aligns the error and warning wrapping and adds tests for those cases.
What this PR does:
Which issue(s) this PR fixes:
Fixes #
Checklist
[ ] Documentation addedCHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]