]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: _exit() intead of exit() for failure injection
authorSage Weil <sage@redhat.com>
Fri, 30 Dec 2016 20:42:44 +0000 (15:42 -0500)
committerSage Weil <sage@redhat.com>
Mon, 9 Jan 2017 22:25:13 +0000 (16:25 -0600)
This avoids a segv from code that doesn't easily shut
down (e.g., bluestore).

Fixes: http://tracker.ceph.com/issues/18372
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit c2fac9c9a92a63b9a456c9e301c4b393de096a97)

src/osd/OSD.cc

index e379263040699705fff4353efb6d3075adcbd9d8..3b62ef3755b80c74bb6ef8c8ca82a6622424ea68 100644 (file)
@@ -4791,7 +4791,7 @@ void OSD::RemoveWQ::_process(
 
   if (g_conf->osd_inject_failure_on_pg_removal) {
     generic_derr << "osd_inject_failure_on_pg_removal" << dendl;
-    exit(1);
+    _exit(1);
   }
   t.remove_collection(coll);