]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr: skip shutdown and exit
authorSage Weil <sage@redhat.com>
Thu, 7 Mar 2019 17:22:27 +0000 (11:22 -0600)
committerSage Weil <sage@redhat.com>
Thu, 7 Mar 2019 17:23:31 +0000 (11:23 -0600)
The python subinterpreter teardown is broken; see
https://tracker.ceph.com/issues/38621

Instead, just exit with the appropriate error code.  That way we don't
crash and leave a core and ugly stack trace behind.

Users won't care, although our leak checking will.

Signed-off-by: Sage Weil <sage@redhat.com>
src/mgr/MgrStandby.cc

index e0c80e0b00e1df6059ce876d48112d21d74e6047..19c42a450b6b8176807c0954a0bbea22d5408212 100644 (file)
@@ -264,7 +264,8 @@ void MgrStandby::handle_signal(int signum)
 {
   ceph_assert(signum == SIGINT || signum == SIGTERM);
   derr << "*** Got signal " << sig_str(signum) << " ***" << dendl;
-  shutdown();
+  _exit(128 + signum);
+  //shutdown();
 }
 
 void MgrStandby::shutdown()