fix: don't panic when closing registry querier #1049
Closed
Conversation
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
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: joelanford The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
joelanford
force-pushed
the
fix-serve-panic
branch
from
b1469a0 to
ffad6cf
Compare
When certain errors occur loading a registry.Querier, it is possible for a Querier to be returned with a nil cache. This causes a panic when Close is later called on the Querier. This commit refactors the behavior such that: 1. If any error occurs creating a Querier, any necessary cleanup happens and a nil Querier is returned. 2. Querier.Close checks for a nil cache before attempting a close of the Querier's underlying cache. Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
joelanford
force-pushed
the
fix-serve-panic
branch
from
ffad6cf to
e266ee6
Compare
Codecov Report
@@ Coverage Diff @@
## master #1049 +/- ##
==========================================
+ Coverage 52.06% 52.17% +0.11%
==========================================
Files 102 102
Lines 9218 9246 +28
==========================================
+ Hits 4799 4824 +25
- Misses 3505 3511 +6
+ Partials 914 911 -3
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
Member
Author
|
Closing this one out. I'm taking at stab at #1050, and that work renders this change obsolete. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Description of the change:
This commit refactors the
registry.Querierload behavior such that:Querier, any necessary cleanup happens and a nilQuerieris returned.Querier.Closechecks for a nil cache before attempting a close of theQuerier's underlying cache.Motivation for the change:
When certain errors occur loading a
registry.Querier, it is possible for aQuerierto be returned with a nil cache. This causes a panic whenCloseis later called on theQuerier.Reviewer Checklist
/docs