RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 18:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #27101 into master

Browse Source 
* refs/pull/27101/head:
	mon/MgrStatMonitor: ensure only one copy of initial service map

Reviewed-by: Neha Ojha <nojha@redhat.com>
This commit is contained in:
Sage Weil 2019-03-22 04:29:03 -05:00
commit 7a976b2a49
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mon/MgrStatMonitor.cc
View File

@ -34,6 +34,7 @@ void MgrStatMonitor::create_initial()
dout(10) << __func__ << dendl;
version = 0;
service_map.epoch = 1;
pending_service_map_bl.clear();
encode(service_map, pending_service_map_bl, CEPH_FEATURES_ALL);
}
@ -59,7 +60,8 @@ void MgrStatMonitor::update_from_paxos(bool *need_bootstrap)
<< dendl;
}
catch (buffer::error& e) {
derr << "failed to decode mgrstat state; luminous dev version?" << dendl;
derr << "failed to decode mgrstat state; luminous dev version? "
<< e.what() << dendl;
}
}
check_subs();