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

Merge PR #28662 into master

Browse Source 
* refs/pull/28662/head:
	osd: share curmap in handle_osd_ping

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Neha Ojha <nojha@redhat.com>
This commit is contained in:
Sage Weil 2019-06-24 13:13:48 -05:00
commit 537dad90a9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/osd/OSD.cc
View File

@ -4575,7 +4575,7 @@ void OSD::handle_osd_ping(MOSDPing *m)
if (is_active()) {
ConnectionRef con = service.get_con_osd_cluster(from, curmap->get_epoch());
if (con) {
service.maybe_share_map(con.get(), get_osdmap(), m->map_epoch);
service.maybe_share_map(con.get(), curmap, m->map_epoch);
}
}
} else if (!curmap->exists(from) ||
@ -4669,7 +4669,7 @@ void OSD::handle_osd_ping(MOSDPing *m)
if (is_active()) {
ConnectionRef con = service.get_con_osd_cluster(from, curmap->get_epoch());
if (con) {
service.maybe_share_map(con.get(), get_osdmap(), m->map_epoch);
service.maybe_share_map(con.get(), curmap, m->map_epoch);
}
}
}