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

Merge pull request #8857 from liewegas/wip-15678

Browse Source 
osd: handle boot racing with NOUP set

test run http://pulpito.ceph.com/yuriw-2016-05-07_09:11:04-rados-wip-yuri-testing---basic-smithi/
This commit is contained in:
Yuri Weinstein 2016-05-09 09:09:13 -07:00
commit 22dc9696b6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osd/OSD.cc
View File

@ -6871,9 +6871,9 @@ void OSD::_committed_osd_maps(epoch_t first, epoch_t last, MOSDMap *m)
}
}
if (osdmap->test_flag(CEPH_OSDMAP_NOUP) &&
!newmap->test_flag(CEPH_OSDMAP_NOUP)) {
dout(10) << __func__ << " NOUP flag cleared in " << newmap->get_epoch()
if (osdmap->test_flag(CEPH_OSDMAP_NOUP) !=
newmap->test_flag(CEPH_OSDMAP_NOUP)) {
dout(10) << __func__ << " NOUP flag changed in " << newmap->get_epoch()
<< dendl;
if (is_booting()) {
// this captures the case where we sent the boot message while