-
Notifications
You must be signed in to change notification settings - Fork 560
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
Fix querier panics #4790
Merged
Merged
Fix querier panics #4790
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
Signed-off-by: Joe Elliott <number101010@gmail.com>
Signed-off-by: Joe Elliott <number101010@gmail.com>
Signed-off-by: Joe Elliott <number101010@gmail.com>
Signed-off-by: Joe Elliott <number101010@gmail.com>
Signed-off-by: Joe Elliott <number101010@gmail.com>
Signed-off-by: Joe Elliott <number101010@gmail.com>
Signed-off-by: Joe Elliott <number101010@gmail.com>
carles-grafana
approved these changes
Mar 5, 2025
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-4790-to-release-v2.7 origin/release-v2.7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 6d707056521ce46c79179fc16fc12126579f66a0 When the conflicts are resolved, stage and commit the changes:
If you have the GitHub CLI installed: # Push the branch to GitHub:
git push --set-upstream origin backport-4790-to-release-v2.7
# Create the PR body template
PR_BODY=$(gh pr view 4790 --json body --template 'Backport 6d707056521ce46c79179fc16fc12126579f66a0 from #4790{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release-v2.7] Fix querier panics' --body-file - --label 'type/bug' --label 'backport' --base release-v2.7 --milestone release-v2.7 --web Or, if you don't have the GitHub CLI installed (we recommend you install it!): # Push the branch to GitHub:
git push --set-upstream origin backport-4790-to-release-v2.7
# Create a pull request where the `base` branch is `release-v2.7` and the `compare`/`head` branch is `backport-4790-to-release-v2.7`.
# Remove the local backport branch
git switch main
git branch -D backport-4790-to-release-v2.7 |
joe-elliott
added a commit
that referenced
this pull request
Mar 25, 2025
* fix forIngesterRings Signed-off-by: Joe Elliott <number101010@gmail.com> * fix generators Signed-off-by: Joe Elliott <number101010@gmail.com> * refactor to pass the funcs in directly Signed-off-by: Joe Elliott <number101010@gmail.com> * fix breaks Signed-off-by: Joe Elliott <number101010@gmail.com> * improve error Signed-off-by: Joe Elliott <number101010@gmail.com> * got rid of metrics collector Signed-off-by: Joe Elliott <number101010@gmail.com> * chagnelog Signed-off-by: Joe Elliott <number101010@gmail.com> * fix found behavior Signed-off-by: Joe Elliott <number101010@gmail.com> --------- Signed-off-by: Joe Elliott <number101010@gmail.com> (cherry picked from commit 6d70705)
3 tasks
joe-elliott
added a commit
that referenced
this pull request
Mar 25, 2025
* fix forIngesterRings Signed-off-by: Joe Elliott <number101010@gmail.com> * fix generators Signed-off-by: Joe Elliott <number101010@gmail.com> * refactor to pass the funcs in directly Signed-off-by: Joe Elliott <number101010@gmail.com> * fix breaks Signed-off-by: Joe Elliott <number101010@gmail.com> * improve error Signed-off-by: Joe Elliott <number101010@gmail.com> * got rid of metrics collector Signed-off-by: Joe Elliott <number101010@gmail.com> * chagnelog Signed-off-by: Joe Elliott <number101010@gmail.com> * fix found behavior Signed-off-by: Joe Elliott <number101010@gmail.com> --------- Signed-off-by: Joe Elliott <number101010@gmail.com> (cherry picked from commit 6d70705)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
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:
A panic was introduced here by abusing the ring forEach function to collect results. replicationSet.Do can return before all reads are complete if quorum is reached. Under certain, rare circumstances this caused the forEach function to modify a result here after it has already been returned and was being marshalled by the gRPC stack into proto.
Checklist
CHANGELOG.md
updated - the order of entries should be[CHANGE]
,[FEATURE]
,[ENHANCEMENT]
,[BUGFIX]