From: Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
Date: Fri, 21 Jan 2011 14:45:40 +0000 (-0800)
Subject: mds: respawn must unblock signals before exec
X-Git-Tag: v0.24.2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=444e930ab302f8fe24b88e1cb33b32c890168442;p=ceph.git

mds: respawn must unblock signals before exec

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
---

diff --git a/src/common/signal.h b/src/common/signal.h
index 0ffa700c92a6..d62c6864e62b 100644
--- a/src/common/signal.h
+++ b/src/common/signal.h
@@ -15,6 +15,9 @@
 #ifndef CEPH_COMMON_SIGNAL_H
 #define CEPH_COMMON_SIGNAL_H
 
+#include <signal.h>
+#include <string>
+
 // Install the standard Ceph signal handlers
 void install_standard_sighandlers(void);
 
diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index 1ea7d00095e1..b3ad1ffd68b8 100644
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -16,6 +16,7 @@
 
 #include "include/types.h"
 #include "common/Clock.h"
+#include "common/signal.h"
 
 #include "msg/Messenger.h"
 #include "mon/MonClient.h"
@@ -1451,6 +1452,7 @@ void MDS::respawn()
 
   dout(1) << " cwd " << get_current_dir_name() << dendl;
 
+  unblock_all_signals(NULL);
   execv(orig_argv[0], new_argv);
 
   dout(0) << "respawn execv " << orig_argv[0] << " failed with " << strerror(errno) << dendl;