RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-19 09:32:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16287 from liewegas/wip-try-decode

Browse Source 
mon/MgrStatMonitor: do not crash on luminous dev version upgrades

Reviewed-by: Yan, Zheng" <zyan@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
This commit is contained in:
Sage Weil 2017-07-12 09:34:20 -05:00 committed by GitHub
commit 808bd2ca93
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/mon/MgrStatMonitor.cc
View File

@ -85,13 +85,18 @@ void MgrStatMonitor::update_from_paxos(bool *need_bootstrap)
get_version(version, bl);
if (version) {
assert(bl.length());
auto p = bl.begin();
::decode(digest, p);
::decode(health_summary, p);
::decode(health_detail, p);
::decode(service_map, p);
dout(10) << __func__ << " v" << version
<< " service_map e" << service_map.epoch << dendl;
try {
auto p = bl.begin();
::decode(digest, p);
::decode(health_summary, p);
::decode(health_detail, p);
::decode(service_map, p);
dout(10) << __func__ << " v" << version
<< " service_map e" << service_map.epoch << dendl;
}
catch (buffer::error& e) {
derr << "failed to decode mgrstat state; luminous dev version?" << dendl;
}
}
check_subs();
update_logger();