distributor: prevent panics when concurrently calling to forwarder's…#1422
Merged
mapno merged 4 commits intografana:mainfrom May 5, 2022
Merged
distributor: prevent panics when concurrently calling to forwarder's…#1422mapno merged 4 commits intografana:mainfrom
mapno merged 4 commits intografana:mainfrom
Conversation
mapno
requested review from
annanay25,
dgzlopes,
joe-elliott,
mdisibio,
yvrhdn and
zalegrala
as code owners
mdisibio
approved these changes
May 5, 2022
Contributor
|
The backport to 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-r41Then, create a pull request where the |
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>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
What this PR does:
Prevent panics when concurrently calling
shutdownto forwarder's queueManager.Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]