pybind/mgr/prometheus: don't crash when encountering an unknown PG state #18903
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
jcsp
approved these changes
Nov 13, 2017
jcsp
reviewed
Nov 13, 2017
src/pybind/mgr/prometheus/module.py
Outdated
| @@ -263,7 +263,10 @@ def get_pg_status(self): | |||
| key.split('+')] | |||
| for state, value in reported_pg_s: | |||
| path = 'pg_{}'.format(state) | |||
| self.metrics[path].set(value) | |||
| if path in self.metrics: | |||
| self.metrics[path].set(value) | |||
There was a problem hiding this comment.
Might be a little bit more pythonic+efficient to do this by doing a .get() and catching KeyError instead of doing the in test first
There was a problem hiding this comment.
Ah yes of course...thx
There was a problem hiding this comment.
oh my bad... .get() never throws a KeyError. So access via .[path] is needed to get the exception.
jan--f
force-pushed
the
jan-mgr-prometheus-unkown-pgstate
branch
from
8a43def
to
8a00e9e
Compare
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
jan--f
force-pushed
the
jan-mgr-prometheus-unkown-pgstate
branch
from
8a00e9e
to
67a1b66
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Signed-off-by: Jan Fajerski jfajerski@suse.com