Skip to content

Commit

Permalink
Merge pull request #11052 from yuyuyu101/wip-shutdown-deadlock
Browse files Browse the repository at this point in the history
OSD: avoid FileStore finisher deadlock in osd_lock when shutdown OSD

Reviewed-by: Sage Weil <sage@redhat.com>
  • Loading branch information
yuriw committed Sep 22, 2016
2 parents 729a43f + aa8f2f1 commit 3edc5c0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/osd/OSD.cc
Expand Up @@ -6868,11 +6868,11 @@ void OSD::handle_osd_map(MOSDMap *m)
void OSD::_committed_osd_maps(epoch_t first, epoch_t last, MOSDMap *m)
{
dout(10) << __func__ << " " << first << ".." << last << dendl;
Mutex::Locker l(osd_lock);
if (is_stopping()) {
dout(10) << __func__ << " bailing, we are shutting down" << dendl;
return;
}
Mutex::Locker l(osd_lock);
map_lock.get_write();

bool do_shutdown = false;
Expand Down

0 comments on commit 3edc5c0

Please sign in to comment.