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

Wrap mutex around combiner now that results are processed in parallel #4153

Merged
merged 2 commits into from
Oct 2, 2024
Merged

Wrap mutex around combiner now that results are processed in parallel #4153

merged 2 commits into from
Oct 2, 2024

Conversation

zalegrala
Copy link
Contributor

@zalegrala zalegrala commented Oct 2, 2024 •
edited
Loading

What this PR does:

Which issue(s) this PR fixes:
Fixes #

Checklist

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

@zalegrala zalegrala marked this pull request as ready for review October 2, 2024 14:14
@zalegrala zalegrala merged commit 90e9b11 into grafana:main Oct 2, 2024
16 checks passed
@zalegrala zalegrala deleted the combinerMutex branch October 2, 2024 15:18
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Oct 3, 2024

Hello @kvrhdn!
Backport pull requests need to be either:

  • Pull requests which address bugs,
  • Urgent fixes which need product approval, in order to get merged,
  • Docs changes.

Please, if the current pull request addresses a bug fix, label it with the type/bug label.
If it already has the product approval, please add the product-approved label. For docs changes, please add the type/docs label.
If the pull request modifies CI behaviour, please add the type/ci label.
If none of the above applies, please consider removing the backport label and target the next major/minor release.
Thanks!

@yvrhdn yvrhdn added the type/bug Something isn't working label Oct 3, 2024
github-actions bot pushed a commit that referenced this pull request Oct 3, 2024
@zalegrala @grafana-delivery-bot
Wrap mutex around combiner now that results are processed in parallel (…
f38ef25 
…#4153)

* Wrap mutex around combiner now that results are processed in parallel

* Add test for parallel combining

(cherry picked from commit 90e9b11)
@github-actions github-actions bot mentioned this pull request Oct 3, 2024
Merged
3 tasks
yvrhdn pushed a commit that referenced this pull request Oct 3, 2024
@github-actions @zalegrala
Wrap mutex around combiner now that results are processed in parallel (…
69af9ca 
…#4153) (#4154)

* Wrap mutex around combiner now that results are processed in parallel

* Add test for parallel combining

(cherry picked from commit 90e9b11)

Co-authored-by: Zach Leslie <zach.leslie@grafana.com>
github-actions bot pushed a commit that referenced this pull request Oct 3, 2024
@zalegrala @grafana-delivery-bot
Wrap mutex around combiner now that results are processed in parallel (…
9f6f540 
…#4153)

* Wrap mutex around combiner now that results are processed in parallel

* Add test for parallel combining

(cherry picked from commit 90e9b11)
@github-actions github-actions bot mentioned this pull request Oct 3, 2024
Closed
3 tasks
zalegrala added a commit to zalegrala/tempo that referenced this pull request Oct 3, 2024
@zalegrala
Wrap mutex around combiner now that results are processed in parallel (…
508a5a7 
…grafana#4153)

* Wrap mutex around combiner now that results are processed in parallel

* Add test for parallel combining
@zalegrala zalegrala mentioned this pull request Oct 3, 2024
Merged
3 tasks
zalegrala added a commit that referenced this pull request Oct 3, 2024
@zalegrala
Wrap mutex around combiner now that results are processed in parallel (…
91dce8d 
…#4153) (#4156)

* Wrap mutex around combiner now that results are processed in parallel

* Add test for parallel combining
@electron0zero electron0zero mentioned this pull request Nov 28, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mdisibio mdisibio mdisibio approved these changes

@electron0zero electron0zero electron0zero approved these changes

@joe-elliott joe-elliott Awaiting requested review from joe-elliott joe-elliott is a code owner

@annanay25 annanay25 Awaiting requested review from annanay25

@mapno mapno Awaiting requested review from mapno mapno is a code owner

@yvrhdn yvrhdn Awaiting requested review from yvrhdn yvrhdn is a code owner

@ie-pham ie-pham Awaiting requested review from ie-pham ie-pham is a code owner

@stoewer stoewer Awaiting requested review from stoewer stoewer is a code owner

Assignees
No one assigned
Labels
backport r167 backport r168 type/bug Something isn't working
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@zalegrala @electron0zero @mdisibio @yvrhdn