OSD: fix deadlock in OSD::_committed_osd_maps

Fixes: http://tracker.ceph.com/issues/15701 Signed-off-by: Xinze Chi <xinze@xsky.com> (cherry picked from commit 4fbf389)
ceph · May 12, 2016 · 2349179 · 2349179
1 parent d93a90e
commit 2349179
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
@@ -6993,9 +6993,9 @@ void OSD::_committed_osd_maps(epoch_t first, epoch_t last, MOSDMap *m)
         failure_pending.erase(it++);
       }
     }
-    osd_lock.Unlock();
-    shutdown();
-    osd_lock.Lock();
+    // trigger shutdown in a different thread
+    dout(0) << __func__ << " shutdown OSD via async signal" << dendl;
+    queue_async_signal(SIGINT);
   }
   else if (is_preboot()) {
     if (m->get_source().is_mon())