osd, mds: shut down async signal handler on exit

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc
index b0bfa10ded9bf47e24eea09644e483d0e4f460d3..f50f0303166a2d719427fd17a4717d76700d1f65 100644 (file)
--- 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 541c239ef98f79ce5c8ba13d89122dafc8d59ae9..bffa64d532a4b307a57abc3b580b122a9564c991 100644 (file)
--- 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 33a107c1dc03748430d9546b9e49e91c00a4665b..ccf8f4daaa9bebbc0e32d996c5fcacaeb0d06129 100644 (file)
--- 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;