ctdbd: Change some fork() calls to ctdb_fork()

This guarantees that ctdb_set_child_info() is called.

Signed-off-by: Martin Schwenke <martin@meltin.net>

diff --git a/server/ctdb_freeze.c b/server/ctdb_freeze.c
index f422e6d8cc8f1eb596cf702069fc21fd7ed8444e..81c5b560807fe61060667edcf6eaa3189a103885 100644 (file)
--- a/server/ctdb_freeze.c
+++ b/server/ctdb_freeze.c
@@ -190,7 +190,7 @@ static struct ctdb_freeze_handle *ctdb_freeze_lock(struct ctdb_context *ctdb, ui
                return NULL;
        }
        
-       h->child = fork();
+       h->child = ctdb_fork(ctdb);
        if (h->child == -1) {
                DEBUG(DEBUG_ERR,("Failed to fork child for ctdb_freeze_lock\n"));
                talloc_free(h);

diff --git a/server/ctdb_recover.c b/server/ctdb_recover.c
index df0dc66436fa70f287a9dc0524397b79228a878d..b7cfcf620ef6f718aec93b0e0c772bf7dc18845a 100644 (file)
--- a/server/ctdb_recover.c
+++ b/server/ctdb_recover.c
@@ -774,7 +774,7 @@ int32_t ctdb_control_set_recmode(struct ctdb_context *ctdb,
                return -1;
        }
 
-       state->child = fork();
+       state->child = ctdb_fork(ctdb);
        if (state->child == (pid_t)-1) {
                close(state->fd[0]);
                close(state->fd[1]);

diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c
index 7b6534e5245602e2825f44dd7fa94dadc758d793..f419cb7f3182d32bf051dbb6c67852713f6c54df 100644 (file)
--- a/server/ctdb_recoverd.c
+++ b/server/ctdb_recoverd.c
@@ -3781,7 +3781,7 @@ int ctdb_start_recoverd(struct ctdb_context *ctdb)
 
        ctdb->ctdbd_pid = getpid();
 
-       ctdb->recoverd_pid = fork();
+       ctdb->recoverd_pid = ctdb_fork(ctdb);
        if (ctdb->recoverd_pid == -1) {
                return -1;
        }