Merge remote-tracking branch 'gh/wip-2121'

Reviewed-by: Yehuda Sadeh <[email protected]>
slamj1 · Feb 29, 2012 · cbb1280 · cbb1280
2 parents e843766 + 052d64e
commit cbb1280
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 1 deletion.
diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc
@@ -289,6 +289,7 @@ int main(int argc, const char **argv)
 
   messenger->wait();
 
+  unregister_async_signal_handler(SIGHUP, sighup_handler);
   unregister_async_signal_handler(SIGINT, handle_mds_signal);
   unregister_async_signal_handler(SIGTERM, handle_mds_signal);
 

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
@@ -416,6 +416,10 @@ int main(int argc, const char **argv)
   mon->init();
   messenger->wait();
 
+  unregister_async_signal_handler(SIGHUP, sighup_handler);
+  unregister_async_signal_handler(SIGINT, handle_mon_signal);
+  unregister_async_signal_handler(SIGTERM, handle_mon_signal);
+
   store.umount();
   delete mon;
   messenger->destroy();

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
@@ -422,6 +422,10 @@ int main(int argc, const char **argv)
   messenger_hbout->wait();
   cluster_messenger->wait();
 
+  unregister_async_signal_handler(SIGHUP, sighup_handler);
+  unregister_async_signal_handler(SIGINT, handle_osd_signal);
+  unregister_async_signal_handler(SIGTERM, handle_osd_signal);
+
   // done
   delete osd;
   client_messenger->destroy();

diff --git a/src/init-radosgw b/src/init-radosgw
@@ -67,7 +67,11 @@ case "$1" in
 	    start-stop-daemon --start -u $user -x $RADOSGW -- -n $name
 	done
         ;;
-    restart|reload|force-reload)
+    reload)
+	echo "Reloading $name..."
+	start-stop-daemon --signal HUP -x $RADOSGW --oknodo
+	;;
+    restart|force-reload)
         $0 stop
         $0 start
         ;;

diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
@@ -19,6 +19,7 @@
 
 #include "common/ceph_argparse.h"
 #include "global/global_init.h"
+#include "global/signal_handler.h"
 #include "common/config.h"
 #include "common/errno.h"
 #include "common/WorkQueue.h"
@@ -380,6 +381,9 @@ int main(int argc, const char **argv)
   sighandler_usr1 = signal(SIGUSR1, godown_handler);
   sighandler_alrm = signal(SIGALRM, godown_alarm);
 
+  init_async_signal_handler();
+  register_async_signal_handler(SIGHUP, sighup_handler);
+
   FCGX_Init();
 
   sighandler_term = signal(SIGTERM, godown_alarm);
@@ -404,6 +408,8 @@ int main(int argc, const char **argv)
 
   rgw_perf_stop(g_ceph_context);
 
+  unregister_async_signal_handler(SIGHUP, sighup_handler);
+
   return 0;
 }