Merge pull request #9103 from Abhishekvrshny/wip-15797-jewel

jewel: deadlock in OSD::_committed_osd_maps Reviewed-by: Samuel Just <sjust@redhat.com>
ceph · Jun 9, 2016 · 34b193b · 34b193b
2 parents e2a035e + 64f15b3
commit 34b193b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
@@ -7018,9 +7018,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())