diff options
author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2012-05-03 11:42:41 +1000 |
---|---|---|
committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2012-05-03 14:03:26 +1000 |
commit | a57eba2bb49b32f3dc69542de69b8b74ec9d3d09 (patch) | |
tree | 020fe37817cc3736da55a60b7e9912de23a91b9b /ctdb/common/ctdb_fork.c | |
parent | 85432ecc5383fe4aa0fc1af9d816b17cc0629f1e (diff) | |
download | samba-a57eba2bb49b32f3dc69542de69b8b74ec9d3d09.tar.gz samba-a57eba2bb49b32f3dc69542de69b8b74ec9d3d09.tar.xz samba-a57eba2bb49b32f3dc69542de69b8b74ec9d3d09.zip |
Track all child process so we never send a signal to an unrelated process (our child died and kernel wrapped the pid-space and reused the pid for a different process
Wrap all creation of child processes inside ctdb_fork() which is used to track all processes we have spawned.
Capture SIGCHLD to track also which child processes have terminated.
Wrap kill() inside ctdb_kill() and make sure that we never send a !0 signal to a child process pid that has already terminated (and might have been replaced with a
(This used to be ctdb commit f73a4b1495830bcdd094a93732a89dd53b3c2f78)
Diffstat (limited to 'ctdb/common/ctdb_fork.c')
-rw-r--r-- | ctdb/common/ctdb_fork.c | 124 |
1 files changed, 124 insertions, 0 deletions
diff --git a/ctdb/common/ctdb_fork.c b/ctdb/common/ctdb_fork.c new file mode 100644 index 00000000000..81055c5fc92 --- /dev/null +++ b/ctdb/common/ctdb_fork.c @@ -0,0 +1,124 @@ +/* + functions to track and manage processes + + Copyright (C) Ronnie Sahlberg 2012 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see <http://www.gnu.org/licenses/>. +*/ + +#include "includes.h" +#include "system/wait.h" +#include "../include/ctdb_client.h" +#include "../include/ctdb_private.h" +#include "../common/rb_tree.h" + +/* + * This function forks a child process and drops the realtime + * scheduler for the child process. + */ +pid_t ctdb_fork(struct ctdb_context *ctdb) +{ + pid_t pid; + char *process; + + pid = fork(); + if (pid == -1) { + return -1; + } + if (pid == 0) { + if (ctdb->do_setsched) { + ctdb_restore_scheduler(ctdb); + } + ctdb->can_send_controls = false; + return 0; + } + + if (getpid() != ctdb->ctdbd_pid) { + return pid; + } + + process = talloc_asprintf(ctdb->child_processes, "process:%d", (int)pid); + trbt_insert32(ctdb->child_processes, pid, process); + + return pid; +} + + + +static void ctdb_sigchld_handler(struct tevent_context *ev, + struct tevent_signal *te, int signum, int count, + void *dont_care, + void *private_data) +{ + struct ctdb_context *ctdb = talloc_get_type(private_data, struct ctdb_context); + int status; + pid_t pid = -1; + + while (pid != 0) { + pid = waitpid(-1, &status, WNOHANG); + if (pid == -1) { + DEBUG(DEBUG_ERR, (__location__ " waitpid() returned error. errno:%d\n", errno)); + return; + } + if (pid > 0) { + char *process; + + if (getpid() != ctdb->ctdbd_pid) { + continue; + } + + process = trbt_lookup32(ctdb->child_processes, pid); + if (process == NULL) { + DEBUG(DEBUG_ERR,("Got SIGCHLD from pid:%d we didn not spawn with ctdb_fork\n", pid)); + } + + DEBUG(DEBUG_DEBUG, ("SIGCHLD from %d %s\n", (int)pid, process)); + talloc_free(process); + } + } +} + + +struct tevent_signal * +ctdb_init_sigchld(struct ctdb_context *ctdb) +{ + struct tevent_signal *se; + + ctdb->child_processes = trbt_create(ctdb, 0); + + se = tevent_add_signal(ctdb->ev, ctdb, SIGCHLD, 0, ctdb_sigchld_handler, ctdb); + return se; +} + +int +ctdb_kill(struct ctdb_context *ctdb, pid_t pid, int signum) +{ + char *process; + + if (signum == 0) { + return kill(pid, signum); + } + + if (getpid() != ctdb->ctdbd_pid) { + return kill(pid, signum); + } + + process = trbt_lookup32(ctdb->child_processes, pid); + if (process == NULL) { + DEBUG(DEBUG_ERR,("ctdb_kill: trying to kill(%d, %d) a process that does not exist\n", pid, signum)); + return 0; + } + + return kill(pid, signum); +} |