mgr: fix crashable DaemonStateIndex::get calls #17933
Merged
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
tchaikov
approved these changes
Sep 25, 2017
tchaikov
reviewed
Sep 25, 2017
| @@ -121,10 +121,15 @@ PyObject *PyModules::list_servers_python() | |||
|
|
|||
| PyObject *PyModules::get_metadata_python( | |||
| std::string const &handle, | |||
| const std::string &svc_name, | |||
| const std::string &svc_type, | |||
There was a problem hiding this comment.
might want to update the function declaration accordingly?
tchaikov
reviewed
Sep 25, 2017
src/mgr/PyModules.cc
Outdated
| @@ -141,6 +146,11 @@ PyObject *PyModules::get_daemon_status_python( | |||
| const std::string &svc_id) | |||
| { | |||
| auto metadata = daemon_state.get(DaemonKey(svc_name, svc_id)); | |||
| if (metadata == nullptr) { | |||
| derr << "Requested missing service " << svc_type << "." << svc_id << dendl; | |||
There was a problem hiding this comment.
s/svc_type/svc_name/ or update the function signature and its declaration.
This function was recently fixed to return null on missing entries: handle that properly. Fixes: http://tracker.ceph.com/issues/17737 Signed-off-by: John Spray <john.spray@redhat.com>
|
Updated to sort out the svc_name/svc_type |
tchaikov
approved these changes
Sep 25, 2017
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.
This function was recently fixed to return null
on missing entries: handle that properly.
Fixes: http://tracker.ceph.com/issues/17737
Signed-off-by: John Spray john.spray@redhat.com