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

Merge pull request #2064 from somnathr/wip-sd-share-map

Browse Source 
OSD: adjust share_map() to handle the case that the osd is down

Reviewed-by: Samuel Just <sam.just@inktank.com>
This commit is contained in:
Samuel Just 2014-07-03 13:36:27 -07:00
commit f21a01791e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osd/OSD.cc
View File

@ -4823,8 +4823,10 @@ void OSDService::share_map(
<< name << " " << con->get_peer_addr()
<< " " << epoch << dendl;
assert(osd->is_active() ||
osd->is_stopping());
if ((!osd->is_active()) && (!osd->is_stopping())) {
/*It is safe not to proceed as OSD is not in healthy state*/
return;
}
bool want_shared = should_share_map(name, con, epoch,
osdmap, sent_epoch_p);