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

Merge pull request #6547 from xiaoxichen/fix1

Browse Source 
osd: check do_shutdown before do_restart

Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Sage Weil 2015-11-14 21:39:46 -05:00
commit 8dd801d86d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/osd/OSD.cc
View File

@ -6544,16 +6544,17 @@ void OSD::handle_osd_map(MOSDMap *m)
dout(10) << " msg say newest map is " << m->newest_map << ", requesting more" << dendl;
osdmap_subscribe(osdmap->get_epoch()+1, true);
}
else if (do_shutdown) {
osd_lock.Unlock();
shutdown();
osd_lock.Lock();
}
else if (is_booting()) {
start_boot(); // retry
}
else if (do_restart)
start_boot();
osd_lock.Unlock();
if (do_shutdown)
shutdown();
osd_lock.Lock();
m->put();
}