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

mgr: fix crash on missing 'ceph_version' in daemon metadata (fixes #18764) #14129

Merged
merged 2 commits into from Mar 28, 2017

Conversation

Projects
None yet
2 participants
@tserong
Contributor

tserong commented Mar 24, 2017

Two commits - the first actually fixes the crash (leaving ceph_version an empty string internally to PyModules.cc), the second fixes a similar problem I noticed in the fsstatus module.

tserong added some commits Mar 24, 2017

mgr: fix crash on missing 'ceph_version' in daemon metadata
Prior to 1a33123, only OSDs had the Ceph version in their
metadata (MONs and MDSes didn't).  This commit searches for
ceph_version, and if not present just returns an empty string.

Fixes: http://tracker.ceph.com/issues/18764
Signed-off-by: Tim Serong <tserong@suse.com>
pybind/mgr/fsstatus: cope with missing 'ceph_version'
The fsstats module assumes ceph_version always exists in daemon
metadata, but it actually might not if run against older daemons
(see previous commit).  As the version here is actually being
presented to the user, I've set it to "unknown" in the missing
case, rather than an empty string.

Signed-off-by: Tim Serong <tserong@suse.com>
@liewegas

This comment has been minimized.

Member

liewegas commented Mar 24, 2017

retest this please

@liewegas liewegas merged commit fe9d54a into ceph:master Mar 28, 2017

3 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodifed Submodules submodules for project are unmodified
Details
default Build finished.
Details

@tserong tserong deleted the SUSE:wip-18764 branch Mar 28, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment