From: Sage Weil Date: Wed, 22 May 2013 21:56:24 +0000 (-0700) Subject: osd, mds: shut down async signal handler on exit X-Git-Tag: v0.63~8 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=32dc463ad4e3c3d4ddec2adf40e2fccde11c2c27;p=ceph.git osd, mds: shut down async signal handler on exit Signed-off-by: Sage Weil --- diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc index b0bfa10ded9b..f50f0303166a 100644 --- a/src/ceph_mds.cc +++ b/src/ceph_mds.cc @@ -299,6 +299,7 @@ int main(int argc, const char **argv) unregister_async_signal_handler(SIGHUP, sighup_handler); unregister_async_signal_handler(SIGINT, handle_mds_signal); unregister_async_signal_handler(SIGTERM, handle_mds_signal); + shutdown_async_signal_handler(); // yuck: grab the mds lock, so we can be sure that whoever in *mds // called shutdown finishes what they were doing. diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc index 541c239ef98f..bffa64d532a4 100644 --- a/src/ceph_mon.cc +++ b/src/ceph_mon.cc @@ -528,7 +528,6 @@ int main(int argc, const char **argv) unregister_async_signal_handler(SIGHUP, sighup_handler); unregister_async_signal_handler(SIGINT, handle_mon_signal); unregister_async_signal_handler(SIGTERM, handle_mon_signal); - shutdown_async_signal_handler(); delete mon; diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc index 33a107c1dc03..ccf8f4daaa9b 100644 --- a/src/ceph_osd.cc +++ b/src/ceph_osd.cc @@ -458,6 +458,7 @@ int main(int argc, const char **argv) unregister_async_signal_handler(SIGHUP, sighup_handler); unregister_async_signal_handler(SIGINT, handle_osd_signal); unregister_async_signal_handler(SIGTERM, handle_osd_signal); + shutdown_async_signal_handler(); // done delete osd;