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.

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

distributor: prevent panics when concurrently calling to forwarder's… #1422

Merged
merged 4 commits into from May 5, 2022

Conversation

mapno
Copy link
Member

@mapno mapno commented May 5, 2022

What this PR does:

Prevent panics when concurrently calling shutdown to forwarder's queueManager.

Checklist

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

@mapno mapno enabled auto-merge (squash) May 5, 2022 15:50
@mapno mapno merged commit d70d7aa into grafana:main May 5, 2022
@mapno mapno deleted the queue-manager-shutdown-panic-fix branch May 5, 2022 15:53
@github-actions
Copy link
Contributor

github-actions bot commented May 5, 2022

The backport to r41 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-1422-to-r41 origin/r41
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x d70d7aa8ab2ab139f51a3131552c8ce69f34f218
# Push it to GitHub
git push --set-upstream origin backport-1422-to-r41
git switch main
# Remove the local backport branch
git branch -D backport-1422-to-r41

Then, create a pull request where the base branch is r41 and the compare/head branch is backport-1422-to-r41.

mapno added a commit that referenced this pull request May 5, 2022
…#1422)

* distributor: prevent panics when concurrently calling  to forwarder's queueManager

* Update PR number

* Pin k6 version to v0.37.0
joe-elliott added a commit that referenced this pull request Jun 13, 2022
…ers based on the trace id hashes instead of all healthy ingesters (#1484)

* metrics-generator: don't inject X-Scope-OrgID header for single-tenant setups (#1417)

* metrics-generator: don't inject X-Scope-OrgID header for single-tenant setups

* Update CHANGELOG.md

* Fix compactor missing compaction_objects_combined_total metric and not honoring max_bytes_per_trace  (#1420)

* Fix compactor to record compaction_objects_combined_total and honor max_bytes_per_trace again

* changelog

* distributor: prevent panics when concurrently calling  to forwarder's… (#1422)

* distributor: prevent panics when concurrently calling  to forwarder's queueManager

* Update PR number

* Pin k6 version to v0.37.0

* update querier to get ingester instance based on trace id

* rebase with main

* added change log for the config

* update config name as per PR comments

* Doc tweak

Signed-off-by: Joe Elliott <number101010@gmail.com>

Co-authored-by: Koenraad Verheyden <koenraad.verheyden@grafana.com>
Co-authored-by: Martin Disibio <martin.disibio@grafana.com>
Co-authored-by: Mario <mariorvinas@gmail.com>
Co-authored-by: Joe Elliott <number101010@gmail.com>
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.

None yet

3 participants