diff options
| author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2008-07-08 16:31:23 +1000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2008-07-08 16:31:23 +1000 |
| commit | 71d2315eee54ba3eaf5bf16dec74132fd6cc9227 (patch) | |
| tree | 20eeba6e30267fbffd39a37c42591899c3758aed /ctdb | |
| parent | f1c4041c8424065e93b84fa432f412df5e6435e4 (diff) | |
| download | samba-71d2315eee54ba3eaf5bf16dec74132fd6cc9227.tar.gz samba-71d2315eee54ba3eaf5bf16dec74132fd6cc9227.tar.xz samba-71d2315eee54ba3eaf5bf16dec74132fd6cc9227.zip | |
set sigchild to SIG_IGN instead of SIG_DFL
(This used to be ctdb commit b1f1e80d3ad50280a300f2ed021513cf0a6f3a76)
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/server/ctdb_daemon.c | 6 | ||||
| -rw-r--r-- | ctdb/server/ctdb_recoverd.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c index a7f9086e27b..83fcc0aa537 100644 --- a/ctdb/server/ctdb_daemon.c +++ b/ctdb/server/ctdb_daemon.c @@ -662,9 +662,6 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork) } } block_signal(SIGPIPE); - - /* we dont want any SIGCHLD */ - signal(SIGCHLD, SIG_DFL); if (ctdb->do_setsched) { /* try to set us up as realtime */ @@ -734,6 +731,9 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork) /* start the transport going */ ctdb_start_transport(ctdb); + /* we dont want any SIGCHLD */ + signal(SIGCHLD, SIG_IGN); + /* go into a wait loop to allow other nodes to complete */ event_loop_wait(ctdb->ev); diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index 837c0b15451..9059b1c614c 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -3011,6 +3011,9 @@ int ctdb_start_recoverd(struct ctdb_context *ctdb) exit(1); } + /* we dont want any SIGCHLD */ + signal(SIGCHLD, SIG_IGN); + monitor_cluster(ctdb); DEBUG(DEBUG_ALERT,("ERROR: ctdb_recoverd finished!?\n")); |