From: Sage Weil <sage@redhat.com>
Date: Thu, 7 Mar 2019 17:22:27 +0000 (-0600)
Subject: mgr: skip shutdown and exit
X-Git-Tag: v14.1.1~17^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6146c85bb2bda46d9a9e99f3682ede78b1e06347;p=ceph-ci.git

mgr: skip shutdown and exit

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>
---

diff --git a/src/mgr/MgrStandby.cc b/src/mgr/MgrStandby.cc
index e0c80e0b00e..19c42a450b6 100644
--- a/src/mgr/MgrStandby.cc
+++ b/src/mgr/MgrStandby.cc
@@ -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()