eventscript: wait for debugging dump before killing timedout script
[sahlberg/ctdb.git] / server / eventscript.c
index 9e7d05c5797aa1853b1419fa783d7d529cfc0ea9..2691d8f6ec8cdf0685fa58f249eaa17aa508e1b6 100644 (file)
 #include "lib/events/events.h"
 #include "../common/rb_tree.h"
 
-static struct {
-       struct timeval start;
-       const char *script_running;
-} child_state;
-
-static const char *call_names[] = {
-       "startup",
-       "startrecovery",
-       "recovered",
-       "takeip",
-       "releaseip",
-       "stopped",
-       "monitor",
-       "status",
-       "shutdown",
-       "reload"
-};
-
 static void ctdb_event_script_timeout(struct event_context *ev, struct timed_event *te, struct timeval t, void *p);
 
 /*
@@ -52,20 +34,17 @@ static void ctdb_event_script_timeout(struct event_context *ev, struct timed_eve
  */
 static void sigterm(int sig)
 {
-       char tbuf[100], buf[200];
-       time_t t;
-
-       DEBUG(DEBUG_ERR,("Timed out running script '%s' after %.1f seconds pid :%d\n", 
-                child_state.script_running, timeval_elapsed(&child_state.start), getpid()));
-
-       t = time(NULL);
-
-       strftime(tbuf, sizeof(tbuf)-1, "%Y%m%d%H%M%S",  localtime(&t));
-       sprintf(buf, "pstree -p >/tmp/ctdb.event.%s.%d", tbuf, getpid());
-       system(buf);
-
-       DEBUG(DEBUG_ERR,("Logged timedout eventscript : %s\n", buf));
+       /* all the child processes will be running in the same process group */
+       kill(-getpgrp(), SIGKILL);
+       _exit(1);
+}
 
+/*
+  ctdbd sends us a SIGABRT when we should abort the current script.
+  we abort any active monitor script any time a different event is generated.
+ */
+static void sigabrt(int sig)
+{
        /* all the child processes will be running in the same process group */
        kill(-getpgrp(), SIGKILL);
        _exit(1);
@@ -76,200 +55,62 @@ struct ctdb_event_script_state {
        pid_t child;
        /* Warning: this can free us! */
        void (*callback)(struct ctdb_context *, int, void *);
-       int cb_status;
        int fd[2];
        void *private_data;
        bool from_user;
+       bool aborted;
        enum ctdb_eventscript_call call;
        const char *options;
        struct timeval timeout;
 
-       struct ctdb_monitor_script_status *scripts;
-       struct ctdb_script_list *script_list;
+       unsigned int current;
+       struct ctdb_scripts_wire *scripts;
 };
 
-
-struct ctdb_monitor_script_status {
-       struct ctdb_monitor_script_status *next;
-       const char *name;
-       struct timeval start;
-       struct timeval finished;
-       int32_t status;
-       char *output;
-};
-
-/* called from ctdb_logging when we have received output on STDERR from
- * one of the eventscripts
- */
-int ctdb_log_event_script_output(struct ctdb_context *ctdb, char *str, uint16_t len)
+static struct ctdb_script_wire *get_current_script(struct ctdb_event_script_state *state)
 {
-       struct ctdb_monitor_script_status *script;
-
-       if (ctdb->current_monitor == NULL) {
-               return -1;
-       }
-
-       script = ctdb->current_monitor->scripts;
-       if (script == NULL) {
-               return -1;
-       }
-
-       if (script->output == NULL) {
-               script->output = talloc_asprintf(script, "%*.*s", len, len, str);
-       } else {
-               script->output = talloc_asprintf_append(script->output, "%*.*s", len, len, str);
-       }
-
-       return 0;
+       return &state->scripts->scripts[state->current];
 }
 
-/* called from the event script child process when we are starting a new
- * monitor event
- */
-int32_t ctdb_control_event_script_init(struct ctdb_context *ctdb)
-{
-       DEBUG(DEBUG_INFO, ("event script init called\n"));
-
-       if (ctdb->current_monitor == NULL) {
-               DEBUG(DEBUG_ERR,(__location__ " current_monitor_status_ctx is NULL when initing script\n"));
-               return -1;
-       }
-
-       return 0;
-}
-
-
-/* called from the event script child process when we are star running
- * an eventscript
- */
-int32_t ctdb_control_event_script_start(struct ctdb_context *ctdb, TDB_DATA indata)
-{
-       const char *name = (const char *)indata.dptr;
-       struct ctdb_monitor_script_status *script;
-
-       DEBUG(DEBUG_INFO, ("event script start called : %s\n", name));
-
-       if (ctdb->current_monitor == NULL) {
-               DEBUG(DEBUG_ERR,(__location__ " current_monitor_status_ctx is NULL when starting script\n"));
-               return -1;
-       }
-
-       script = talloc_zero(ctdb->current_monitor, struct ctdb_monitor_script_status);
-       if (script == NULL) {
-               DEBUG(DEBUG_ERR,(__location__ " Failed to talloc ctdb_monitor_script_status for script %s\n", name));
-               return -1;
-       }
-
-       script->next  = ctdb->current_monitor->scripts;
-       script->name  = talloc_strdup(script, name);
-       CTDB_NO_MEMORY(ctdb, script->name);
-       script->start = timeval_current();
-       ctdb->current_monitor->scripts = script;
-
-       return 0;
-}
-
-/* called from the event script child process when we have finished running
- * an eventscript
+/* called from ctdb_logging when we have received output on STDERR from
+ * one of the eventscripts
  */
-int32_t ctdb_control_event_script_stop(struct ctdb_context *ctdb, TDB_DATA indata)
-{
-       int32_t res = *((int32_t *)indata.dptr);
-       struct ctdb_monitor_script_status *script;
-
-       if (ctdb->current_monitor == NULL) {
-               DEBUG(DEBUG_ERR,(__location__ " current_monitor_status_ctx is NULL when script finished\n"));
-               return -1;
-       }
-
-       script = ctdb->current_monitor->scripts;
-       if (script == NULL) {
-               DEBUG(DEBUG_ERR,(__location__ " script is NULL when the script had finished\n"));
-               return -1;
-       }
-
-       script->finished = timeval_current();
-       script->status   = res;
-
-       DEBUG(DEBUG_INFO, ("event script stop called for script:%s duration:%.1f status:%d\n", script->name, timeval_elapsed(&script->start), (int)res));
-
-       return 0;
-}
-
-static struct ctdb_monitoring_wire *marshall_monitoring_scripts(TALLOC_CTX *mem_ctx, struct ctdb_monitoring_wire *monitoring_scripts, struct ctdb_monitor_script_status *script)
+static void log_event_script_output(const char *str, uint16_t len, void *p)
 {
-       struct ctdb_monitoring_script_wire script_wire;
-       size_t size;
+       struct ctdb_event_script_state *state
+               = talloc_get_type(p, struct ctdb_event_script_state);
+       struct ctdb_script_wire *current;
+       unsigned int slen, min;
 
-       if (script == NULL) {
-               return monitoring_scripts;
-       }
-       monitoring_scripts = marshall_monitoring_scripts(mem_ctx, monitoring_scripts, script->next);
-       if (monitoring_scripts == NULL) {
-               return NULL;
+       /* We may have been aborted to run something else.  Discard */
+       if (state->scripts == NULL) {
+               return;
        }
 
-       bzero(&script_wire, sizeof(struct ctdb_monitoring_script_wire));
-       strncpy(script_wire.name, script->name, MAX_SCRIPT_NAME);
-       script_wire.start    = script->start;
-       script_wire.finished = script->finished;
-       script_wire.status   = script->status;
-       if (script->output != NULL) {
-               strncpy(script_wire.output, script->output, MAX_SCRIPT_OUTPUT);
-       }
+       current = get_current_script(state);
 
-       size = talloc_get_size(monitoring_scripts);
-       monitoring_scripts = talloc_realloc_size(mem_ctx, monitoring_scripts, size + sizeof(struct ctdb_monitoring_script_wire));
-       if (monitoring_scripts == NULL) {
-               DEBUG(DEBUG_ERR,(__location__ " Failed to talloc_resize monitoring_scripts blob\n"));
-               return NULL;
-       }
+       /* Append, but don't overfill buffer.  It starts zero-filled. */
+       slen = strlen(current->output);
+       min = MIN(len, sizeof(current->output) - slen - 1);
 
-       memcpy(&monitoring_scripts->scripts[monitoring_scripts->num_scripts], &script_wire, sizeof(script_wire));
-       monitoring_scripts->num_scripts++;
-       
-       return monitoring_scripts;
+       memcpy(current->output + slen, str, min);
 }
 
-/* called from the event script child process when we have completed a
- * monitor event
- */
-int32_t ctdb_control_event_script_finished(struct ctdb_context *ctdb)
+int32_t ctdb_control_get_event_script_status(struct ctdb_context *ctdb,
+                                            uint32_t call_type,
+                                            TDB_DATA *outdata)
 {
-       DEBUG(DEBUG_INFO, ("event script finished called\n"));
-
-       if (ctdb->current_monitor == NULL) {
-               DEBUG(DEBUG_ERR,(__location__ " script_status is NULL when monitoring event finished\n"));
+       if (call_type >= CTDB_EVENT_MAX) {
                return -1;
        }
 
-       talloc_free(ctdb->last_status);
-       ctdb->last_status = talloc_size(ctdb, offsetof(struct ctdb_monitoring_wire, scripts));
-       if (ctdb->last_status == NULL) {
-               DEBUG(DEBUG_ERR,(__location__ " failed to talloc last_status\n"));
-               return -1;
-       }
-
-       ctdb->last_status->num_scripts = 0;
-       ctdb->last_status = marshall_monitoring_scripts(ctdb, ctdb->last_status, ctdb->current_monitor->scripts);
-       talloc_free(ctdb->current_monitor->scripts);
-       ctdb->current_monitor->scripts = NULL;
-
-       return 0;
-}
-
-int32_t ctdb_control_get_event_script_status(struct ctdb_context *ctdb, TDB_DATA *outdata)
-{
-       struct ctdb_monitoring_wire *monitoring_scripts = ctdb->last_status;
-
-       if (monitoring_scripts == NULL) {
-               DEBUG(DEBUG_ERR,(__location__ " last_monitor_status_ctx is NULL when reading status\n"));
-               return -1;
+       if (ctdb->last_status[call_type] == NULL) {
+               /* If it's never been run, return nothing so they can tell. */
+               outdata->dsize = 0;
+       } else {
+               outdata->dsize = talloc_get_size(ctdb->last_status[call_type]);
+               outdata->dptr  = (uint8_t *)ctdb->last_status[call_type];
        }
-
-       outdata->dsize = talloc_get_size(monitoring_scripts);
-       outdata->dptr  = (uint8_t *)monitoring_scripts;
-
        return 0;
 }
 
@@ -278,12 +119,6 @@ struct ctdb_script_tree_item {
        int error;
 };
 
-struct ctdb_script_list {
-       struct ctdb_script_list *next;
-       const char *name;
-       int error;
-};
-
 /* Return true if OK, otherwise set errno. */
 static bool check_executable(const char *dir, const char *name)
 {
@@ -302,7 +137,7 @@ static bool check_executable(const char *dir, const char *name)
        }
 
        if (!(st.st_mode & S_IXUSR)) {
-               DEBUG(DEBUG_INFO,("Event script %s is not executable. Ignoring this event script\n", full));
+               DEBUG(DEBUG_DEBUG,("Event script %s is not executable. Ignoring this event script\n", full));
                errno = ENOEXEC;
                talloc_free(full);
                return false;
@@ -312,13 +147,13 @@ static bool check_executable(const char *dir, const char *name)
        return true;
 }
 
-static struct ctdb_script_list *ctdb_get_script_list(struct ctdb_context *ctdb, TALLOC_CTX *mem_ctx)
+static struct ctdb_scripts_wire *ctdb_get_script_list(struct ctdb_context *ctdb, TALLOC_CTX *mem_ctx)
 {
        DIR *dir;
        struct dirent *de;
        struct stat st;
        trbt_tree_t *tree;
-       struct ctdb_script_list *head, *tail, *new_item;
+       struct ctdb_scripts_wire *scripts;
        TALLOC_CTX *tmp_ctx = talloc_new(ctdb);
        struct ctdb_script_tree_item *tree_item;
        int count;
@@ -370,6 +205,12 @@ static struct ctdb_script_list *ctdb_get_script_list(struct ctdb_context *ctdb,
                        continue;
                }
 
+               if (strlen(de->d_name) > MAX_SCRIPT_NAME) {
+                       DEBUG(DEBUG_ERR,("Script name %s too long! %u chars max",
+                                        de->d_name, MAX_SCRIPT_NAME));
+                       continue;
+               }
+
                tree_item = talloc(tree, struct ctdb_script_tree_item);
                if (tree_item == NULL) {
                        DEBUG(DEBUG_ERR, (__location__ " Failed to allocate new tree item\n"));
@@ -394,59 +235,34 @@ static struct ctdb_script_list *ctdb_get_script_list(struct ctdb_context *ctdb,
        }
        closedir(dir);
 
+       /* Overallocates by one, but that's OK */
+       scripts = talloc_zero_size(tmp_ctx,
+                                  sizeof(*scripts)
+                                  + sizeof(scripts->scripts[0]) * count);
+       if (scripts == NULL) {
+               DEBUG(DEBUG_ERR, (__location__ " Failed to allocate scripts\n"));
+               talloc_free(tmp_ctx);
+               return NULL;
+       }
+       scripts->num_scripts = count;
 
-       head = NULL;
-       tail = NULL;
-
-       /* fetch the scripts from the tree one by one and add them to the linked
-          list
-        */
-       while ((tree_item=trbt_findfirstarray32(tree, 1)) != NULL) {
+       for (count = 0; count < scripts->num_scripts; count++) {
+               tree_item = trbt_findfirstarray32(tree, 1);
 
-               new_item = talloc(tmp_ctx, struct ctdb_script_list);
-               if (new_item == NULL) {
-                       DEBUG(DEBUG_ERR, (__location__ " Failed to allocate new list item\n"));
-                       talloc_free(tmp_ctx);
-                       return NULL;
-               }
-
-               new_item->next = NULL;
-               new_item->name = talloc_steal(new_item, tree_item->name);
-               new_item->error = tree_item->error;
-
-               if (head == NULL) {
-                       head = new_item;
-                       tail = new_item;
-               } else {
-                       tail->next = new_item;
-                       tail = new_item;
-               }
-
-               talloc_steal(mem_ctx, new_item);
+               strcpy(scripts->scripts[count].name, tree_item->name);
+               scripts->scripts[count].status = -tree_item->error;
 
                /* remove this script from the tree */
                talloc_free(tree_item);
-       }       
+       }
 
+       talloc_steal(mem_ctx, scripts);
        talloc_free(tmp_ctx);
-       return head;
+       return scripts;
 }
 
-static int child_setup(struct ctdb_context *ctdb,
-                      bool from_user,
-                      enum ctdb_eventscript_call call)
+static int child_setup(struct ctdb_context *ctdb)
 {
-       if (!from_user && call == CTDB_EVENT_MONITOR) {
-               /* This is running in the forked child process. At this stage
-                * we want to switch from being a ctdb daemon into being a
-                * client and connect to the real local daemon.
-                */
-               if (switch_from_server_to_client(ctdb) != 0) {
-                       DEBUG(DEBUG_CRIT, (__location__ "ERROR: failed to switch eventscript child into client mode. shutting down.\n"));
-                       _exit(1);
-               }
-       }
-
        if (setpgid(0,0) != 0) {
                int ret = -errno;
                DEBUG(DEBUG_ERR,("Failed to create process group for event scripts - %s\n",
@@ -455,9 +271,7 @@ static int child_setup(struct ctdb_context *ctdb,
        }
 
        signal(SIGTERM, sigterm);
-
-       child_state.start = timeval_current();
-       child_state.script_running = "startup";
+       signal(SIGABRT, sigabrt);
        return 0;
 }
 
@@ -486,7 +300,9 @@ static char *child_command_string(struct ctdb_context *ctdb,
                return talloc_asprintf(ctx, "%s%s/%s %s %s",
                                       str,
                                       ctdb->event_script_dir,
-                                      scriptname, call_names[call], options);
+                                      scriptname,
+                                      ctdb_eventscript_call_names[call],
+                                      options);
        }
 }
 
@@ -526,13 +342,13 @@ static int child_run_script(struct ctdb_context *ctdb,
                            bool from_user,
                            enum ctdb_eventscript_call call,
                            const char *options,
-                           struct ctdb_script_list *current)
+                           struct ctdb_script_wire *current)
 {
        char *cmdstr;
        int ret;
        TALLOC_CTX *tmp_ctx = talloc_new(ctdb);
 
-       ret = child_setup(ctdb, from_user, call);
+       ret = child_setup(ctdb);
        if (ret != 0)
                goto out;
 
@@ -540,110 +356,52 @@ static int child_run_script(struct ctdb_context *ctdb,
                                      current->name, call, options);
        CTDB_NO_MEMORY(ctdb, cmdstr);
 
-       DEBUG(DEBUG_INFO,("Executing event script %s\n",cmdstr));
-
-       child_state.start = timeval_current();
-       child_state.script_running = cmdstr;
+       DEBUG(DEBUG_DEBUG,("Executing event script %s\n",cmdstr));
 
-       if (!from_user && call == CTDB_EVENT_MONITOR) {
-               if (ctdb_ctrl_event_script_start(ctdb, current->name) != 0) {
-                       ret = -EIO;
-                       goto out;
-               }
-
-               if (current->error) {
-                       if (ctdb_ctrl_event_script_stop(ctdb, -current->error) != 0) {
-                               ret = -EIO;
-                               goto out;
-                       }
-               }
-       }
-
-       if (current->error) {
-               ret = -current->error;
+       if (current->status) {
+               ret = current->status;
                goto out;
        }
 
        ret = child_run_one(ctdb, current->name, cmdstr);
-
-       if (!from_user && call == CTDB_EVENT_MONITOR) {
-               if (ctdb_ctrl_event_script_stop(ctdb, ret) != 0) {
-                       ret = -EIO;
-                       goto out;
-               }
-       }
-
-       child_state.start = timeval_current();
-       child_state.script_running = "finished";
-
 out:
        talloc_free(tmp_ctx);
        return ret;
 }
 
-/* called when child is finished */
-static void ctdb_event_script_handler(struct event_context *ev, struct fd_event *fde, 
-                                     uint16_t flags, void *p)
+static void ctdb_event_script_handler(struct event_context *ev, struct fd_event *fde,
+                                     uint16_t flags, void *p);
+
+static int fork_child_for_script(struct ctdb_context *ctdb,
+                                struct ctdb_event_script_state *state)
 {
-       struct ctdb_event_script_state *state = 
-               talloc_get_type(p, struct ctdb_event_script_state);
-       struct ctdb_context *ctdb = state->ctdb;
        int r;
+       struct ctdb_script_wire *current = get_current_script(state);
 
-       r = read(state->fd[0], &state->cb_status, sizeof(state->cb_status));
-       if (r < 0) {
-               state->cb_status = -errno;
-       } else if (r != sizeof(state->cb_status)) {
-               state->cb_status = -EIO;
-       } else {
-               /* don't stop just because it vanished or was disabled. */
-               if (state->cb_status == -ENOENT || state->cb_status == -ENOEXEC) {
-                       state->cb_status = 0;
-               }
-       }
-
-       state->child = 0;
-       state->script_list = state->script_list->next;
-
-       /* Aborted or finished all scripts?  We're done. */
-       if (state->cb_status != 0 || state->script_list == NULL) {
-               DEBUG(DEBUG_INFO,(__location__ " Eventscript %s %s finished with state %d\n",
-                                 call_names[state->call], state->options, state->cb_status));
-
-               if (!state->from_user && state->call == CTDB_EVENT_MONITOR) {
-                       ctdb_control_event_script_finished(ctdb);
-               }
-               ctdb->event_script_timeouts = 0;
-               talloc_free(state);
-               return;
-       }
+       current->start = timeval_current();
 
-       /* Forget about that old fd. */
-       talloc_free(fde);
-
-       /* Next script! */
        r = pipe(state->fd);
        if (r != 0) {
-               state->cb_status = -errno;
-               goto abort;
+               DEBUG(DEBUG_ERR, (__location__ " pipe failed for child eventscript process\n"));
+               return -errno;
        }
 
-       state->child = fork();
-
-       if (state->child == (pid_t)-1) {
-               state->cb_status = -errno;
+       if (!ctdb_fork_with_logging(state, ctdb, log_event_script_output,
+                                   state, &state->child)) {
+               r = -errno;
                close(state->fd[0]);
                close(state->fd[1]);
-               goto abort;
+               return r;
        }
 
+       /* If we are the child, do the work. */
        if (state->child == 0) {
                int rt;
 
                close(state->fd[0]);
                set_close_on_exec(state->fd[1]);
 
-               rt = child_run_script(ctdb, state->from_user, state->call, state->options, state->script_list);
+               rt = child_run_script(ctdb, state->from_user, state->call, state->options, current);
                /* We must be able to write PIPEBUF bytes at least; if this
                   somehow fails, the read above will be short. */
                write(state->fd[1], &rt, sizeof(rt));
@@ -659,41 +417,151 @@ static void ctdb_event_script_handler(struct event_context *ev, struct fd_event
        /* Set ourselves up to be called when that's done. */
        event_add_fd(ctdb->ev, state, state->fd[0], EVENT_FD_READ|EVENT_FD_AUTOCLOSE,
                     ctdb_event_script_handler, state);
-       return;
+       return 0;
+}
 
-abort:
-       /* This calls the callback. */
-       talloc_free(state);
+/*
+ Summarize status of this run of scripts.
+ */
+static int script_status(struct ctdb_scripts_wire *scripts)
+{
+       unsigned int i;
+
+       for (i = 0; i < scripts->num_scripts; i++) {
+               switch (scripts->scripts[i].status) {
+               case -ENOENT:
+               case -ENOEXEC:
+                       /* Disabled or missing; that's OK. */
+                       break;
+               case 0:
+                       /* No problem. */
+                       break;
+               default:
+                       return scripts->scripts[i].status;
+               }
+       }
+
+       /* All OK! */
+       return 0;
 }
 
-/* called when child times out */
-static void ctdb_event_script_timeout(struct event_context *ev, struct timed_event *te, 
-                                     struct timeval t, void *p)
+/* called when child is finished */
+static void ctdb_event_script_handler(struct event_context *ev, struct fd_event *fde, 
+                                     uint16_t flags, void *p)
 {
-       struct ctdb_event_script_state *state = talloc_get_type(p, struct ctdb_event_script_state);
+       struct ctdb_event_script_state *state = 
+               talloc_get_type(p, struct ctdb_event_script_state);
+       struct ctdb_script_wire *current = get_current_script(state);
        struct ctdb_context *ctdb = state->ctdb;
+       int r, status;
+
+       r = read(state->fd[0], &current->status, sizeof(current->status));
+       if (r < 0) {
+               current->status = -errno;
+       } else if (r != sizeof(current->status)) {
+               current->status = -EIO;
+       }
+
+       current->finished = timeval_current();
+       /* valgrind gets overloaded if we run next script as it's still doing
+        * post-execution analysis, so kill finished child here. */
+       if (ctdb->valgrinding) {
+               kill(state->child, SIGKILL);
+       }
+
+       state->child = 0;
+
+       status = script_status(state->scripts);
+
+       /* Aborted or finished all scripts?  We're done. */
+       if (status != 0 || state->current+1 == state->scripts->num_scripts) {
+               DEBUG(DEBUG_INFO,(__location__ " Eventscript %s %s finished with state %d\n",
+                                 ctdb_eventscript_call_names[state->call], state->options, status));
+
+               ctdb->event_script_timeouts = 0;
+               talloc_free(state);
+               return;
+       }
+
+       /* Forget about that old fd. */
+       talloc_free(fde);
+
+       /* Next script! */
+       state->current++;
+       current++;
+       current->status = fork_child_for_script(ctdb, state);
+       if (current->status != 0) {
+               /* This calls the callback. */
+               talloc_free(state);
+       }
+}
+
+static void debug_timeout(struct ctdb_event_script_state *state)
+{
+       struct ctdb_script_wire *current = get_current_script(state);
+       char *cmd;
+       pid_t pid;
+       time_t t;
+       char tbuf[100], buf[200];
 
-       DEBUG(DEBUG_ERR,("Event script timed out : %s %s count : %u  pid : %d\n",
-                        call_names[state->call], state->options, ctdb->event_script_timeouts, state->child));
+       cmd = child_command_string(state->ctdb, state,
+                                  state->from_user, current->name,
+                                  state->call, state->options);
+       CTDB_NO_MEMORY_VOID(state->ctdb, cmd);
 
-       state->cb_status = -ETIME;
+       DEBUG(DEBUG_ERR,("Timed out running script '%s' after %.1f seconds pid :%d\n",
+                        cmd, timeval_elapsed(&current->start), state->child));
+       talloc_free(cmd);
 
-       if (kill(state->child, 0) != 0) {
-               DEBUG(DEBUG_ERR,("Event script child process already dead, errno %s(%d)\n", strerror(errno), errno));
+       t = time(NULL);
+       strftime(tbuf, sizeof(tbuf)-1, "%Y%m%d%H%M%S",  localtime(&t));
+       sprintf(buf, "{ pstree -p; cat /proc/locks; ls -li /var/ctdb/ /var/ctdb/persistent; }"
+                       " >/tmp/ctdb.event.%s.%d", tbuf, getpid());
+
+       pid = fork();
+       if (pid == 0) {
+               ctdb_reduce_priority(state->ctdb);
+               system(buf);
+               /* Now we can kill the child */
+               kill(state->child, SIGTERM);
+               exit(0);
+       }
+       if (pid == -1) {
+               DEBUG(DEBUG_ERR,("Fork for debug script failed : %s\n",
+                                strerror(errno)));
+       } else {
+               DEBUG(DEBUG_ERR,("Logged timedout eventscript : %s\n", buf));
+               /* Don't kill child until timeout done. */
                state->child = 0;
        }
+}
 
-       if (state->call == CTDB_EVENT_MONITOR || state->call == CTDB_EVENT_STATUS) {
-               struct ctdb_monitor_script_status *script;
+/* called when child times out */
+static void ctdb_event_script_timeout(struct event_context *ev, struct timed_event *te, 
+                                     struct timeval t, void *p)
+{
+       struct ctdb_event_script_state *state = talloc_get_type(p, struct ctdb_event_script_state);
+       struct ctdb_context *ctdb = state->ctdb;
+       struct ctdb_script_wire *current = get_current_script(state);
 
-               if (ctdb->current_monitor != NULL) {
-                       script = ctdb->current_monitor->scripts;
-                       if (script != NULL) {
-                               script->status = state->cb_status;
-                       }
+       DEBUG(DEBUG_ERR,("Event script timed out : %s %s %s count : %u  pid : %d\n",
+                        current->name, ctdb_eventscript_call_names[state->call], state->options, ctdb->event_script_timeouts, state->child));
 
-                       ctdb_control_event_script_finished(ctdb);
-               }
+       /* ignore timeouts for these events */
+       switch (state->call) {
+       case CTDB_EVENT_START_RECOVERY:
+       case CTDB_EVENT_RECOVERED:
+       case CTDB_EVENT_TAKE_IP:
+       case CTDB_EVENT_RELEASE_IP:
+       case CTDB_EVENT_STOPPED:
+       case CTDB_EVENT_MONITOR:
+       case CTDB_EVENT_STATUS:
+               state->scripts->scripts[state->current].status = 0;
+               DEBUG(DEBUG_ERR,("Ignoring hung script for %s call %d\n", state->options, state->call));
+               break;
+        default:
+               state->scripts->scripts[state->current].status = -ETIME;
+               debug_timeout(state);
        }
 
        talloc_free(state);
@@ -704,11 +572,20 @@ static void ctdb_event_script_timeout(struct event_context *ev, struct timed_eve
  */
 static int event_script_destructor(struct ctdb_event_script_state *state)
 {
+       int status;
+
        if (state->child) {
-               DEBUG(DEBUG_ERR,(__location__ " Sending SIGTERM to child pid:%d\n", state->child));
+               if (state->aborted != True) {
+                       DEBUG(DEBUG_ERR,(__location__ " Sending SIGTERM to child pid:%d\n", state->child));
 
-               if (kill(state->child, SIGTERM) != 0) {
-                       DEBUG(DEBUG_ERR,("Failed to kill child process for eventscript, errno %s(%d)\n", strerror(errno), errno));
+                       if (kill(state->child, SIGTERM) != 0) {
+                               DEBUG(DEBUG_ERR,("Failed to kill child process for eventscript, errno %s(%d)\n", strerror(errno), errno));
+                       }
+               } else {
+                       DEBUG(DEBUG_INFO,(__location__ " Sending SIGABRT to script child pid:%d\n", state->child));
+                       if (kill(state->child, SIGABRT) != 0) {
+                               DEBUG(DEBUG_ERR,("Failed to kill child process for eventscript, errno %s(%d)\n", strerror(errno), errno));
+                       }
                }
        }
 
@@ -717,10 +594,27 @@ static int event_script_destructor(struct ctdb_event_script_state *state)
                state->ctdb->current_monitor = NULL;
        }
 
+       /* Save our scripts as the last executed status, if we have them.
+        * See ctdb_event_script_callback_v where we abort monitor event. */
+       if (state->scripts) {
+               talloc_free(state->ctdb->last_status[state->call]);
+               state->ctdb->last_status[state->call] = state->scripts;
+               if (state->current < state->ctdb->last_status[state->call]->num_scripts) {
+                       state->ctdb->last_status[state->call]->num_scripts = state->current+1;
+               }
+       }
+
+       /* Use last status as result, or "OK" if none. */
+       if (state->ctdb->last_status[state->call]) {
+               status = script_status(state->ctdb->last_status[state->call]);
+       } else {
+               status = 0;
+       }
+
        /* This is allowed to free us; talloc will prevent double free anyway,
         * but beware if you call this outside the destructor! */
        if (state->callback) {
-               state->callback(state->ctdb, state->cb_status, state->private_data);
+               state->callback(state->ctdb, status, state->private_data);
        }
 
        return 0;
@@ -743,6 +637,8 @@ static bool check_options(enum ctdb_eventscript_call call, const char *options)
 {
        switch (call) {
        /* These all take no arguments. */
+       case CTDB_EVENT_INIT:
+       case CTDB_EVENT_SETUP:
        case CTDB_EVENT_STARTUP:
        case CTDB_EVENT_START_RECOVERY:
        case CTDB_EVENT_RECOVERED:
@@ -757,6 +653,9 @@ static bool check_options(enum ctdb_eventscript_call call, const char *options)
        case CTDB_EVENT_RELEASE_IP:
                return count_words(options) == 3;
 
+       case CTDB_EVENT_UPDATE_IP: /* old interface, new interface, IP address, netmask bits. */
+               return count_words(options) == 4;
+
        default:
                DEBUG(DEBUG_ERR,(__location__ "Unknown ctdb_eventscript_call %u\n", call));
                return false;
@@ -775,7 +674,6 @@ static int ctdb_event_script_callback_v(struct ctdb_context *ctdb,
                                        const char *fmt, va_list ap)
 {
        struct ctdb_event_script_state *state;
-       int ret;
 
        state = talloc(ctdb->event_script_ctx, struct ctdb_event_script_state);
        CTDB_NO_MEMORY(ctdb, state);
@@ -784,6 +682,7 @@ static int ctdb_event_script_callback_v(struct ctdb_context *ctdb,
        state->callback = callback;
        state->private_data = private_data;
        state->from_user = from_user;
+       state->aborted = False;
        state->call = call;
        state->options = talloc_vasprintf(state, fmt, ap);
        state->timeout = timeval_set(ctdb->tunable.script_timeout, 0);
@@ -795,7 +694,7 @@ static int ctdb_event_script_callback_v(struct ctdb_context *ctdb,
        }
        if (!check_options(state->call, state->options)) {
                DEBUG(DEBUG_ERR, ("Bad eventscript options '%s' for %s\n",
-                                 call_names[state->call], state->options));
+                                 ctdb_eventscript_call_names[state->call], state->options));
                talloc_free(state);
                return -1;
        }
@@ -804,86 +703,73 @@ static int ctdb_event_script_callback_v(struct ctdb_context *ctdb,
                /* we guarantee that only some specifically allowed event scripts are run
                   while in recovery */
                const enum ctdb_eventscript_call allowed_calls[] = {
-                       CTDB_EVENT_START_RECOVERY, CTDB_EVENT_SHUTDOWN, CTDB_EVENT_RELEASE_IP, CTDB_EVENT_STOPPED };
+                       CTDB_EVENT_INIT,
+                       CTDB_EVENT_SETUP,
+                       CTDB_EVENT_START_RECOVERY,
+                       CTDB_EVENT_SHUTDOWN,
+                       CTDB_EVENT_RELEASE_IP,
+                       CTDB_EVENT_STOPPED
+               };
                int i;
                for (i=0;i<ARRAY_SIZE(allowed_calls);i++) {
                        if (call == allowed_calls[i]) break;
                }
                if (i == ARRAY_SIZE(allowed_calls)) {
                        DEBUG(DEBUG_ERR,("Refusing to run event scripts call '%s' while in recovery\n",
-                                call_names[call]));
+                                ctdb_eventscript_call_names[call]));
                        talloc_free(state);
                        return -1;
                }
        }
 
        /* Kill off any running monitor events to run this event. */
-       talloc_free(ctdb->current_monitor);
-       ctdb->current_monitor = NULL;
-
-       if (!from_user && (call == CTDB_EVENT_MONITOR || call == CTDB_EVENT_STATUS)) {
-               ctdb->current_monitor = state;
+       if (ctdb->current_monitor) {
+               /* Discard script status so we don't save to last_status */
+               ctdb->current_monitor->aborted = True;
+               talloc_free(ctdb->current_monitor->scripts);
+               ctdb->current_monitor->scripts = NULL;
+               talloc_free(ctdb->current_monitor);
+               ctdb->current_monitor = NULL;
        }
 
        DEBUG(DEBUG_INFO,(__location__ " Starting eventscript %s %s\n",
-                         call_names[state->call], state->options));
-       
-       state->script_list = ctdb_get_script_list(ctdb, state);
-       if (state->script_list == NULL) {
-               talloc_free(state);
-               return -1;
-       }
+                         ctdb_eventscript_call_names[state->call],
+                         state->options));
 
-       ret = pipe(state->fd);
-       if (ret != 0) {
+       /* This is not a child of state, since we save it in destructor. */
+       state->scripts = ctdb_get_script_list(ctdb, ctdb);
+       if (state->scripts == NULL) {
                talloc_free(state);
                return -1;
        }
+       state->current = 0;
+       state->child = 0;
 
-       if (!state->from_user && state->call == CTDB_EVENT_MONITOR) {
-               ctdb_control_event_script_init(ctdb);
+       if (!from_user && (call == CTDB_EVENT_MONITOR || call == CTDB_EVENT_STATUS)) {
+               ctdb->current_monitor = state;
        }
 
-       state->child = fork();
+       talloc_set_destructor(state, event_script_destructor);
 
-       if (state->child == (pid_t)-1) {
-               if (!state->from_user && state->call == CTDB_EVENT_MONITOR) {
-                       ctdb_control_event_script_finished(ctdb);
-               }
-               close(state->fd[0]);
-               close(state->fd[1]);
+       /* Nothing to do? */
+       if (state->scripts->num_scripts == 0) {
                talloc_free(state);
-               return -1;
-       }
-
-       if (state->child == 0) {
-               int rt;
-
-               close(state->fd[0]);
-               set_close_on_exec(state->fd[1]);
-
-               rt = child_run_script(ctdb, state->from_user, state->call, state->options, state->script_list);
-               /* We must be able to write PIPEBUF bytes at least; if this
-                  somehow fails, the read above will be short. */
-               write(state->fd[1], &rt, sizeof(rt));
-               close(state->fd[1]);
-               _exit(rt);
+               return 0;
        }
 
-       close(state->fd[1]);
-       set_close_on_exec(state->fd[0]);
-       talloc_set_destructor(state, event_script_destructor);
-
-       DEBUG(DEBUG_DEBUG, (__location__ " Created PIPE FD:%d to child eventscript process\n", state->fd[0]));
-
-       event_add_fd(ctdb->ev, state, state->fd[0], EVENT_FD_READ|EVENT_FD_AUTOCLOSE,
-                    ctdb_event_script_handler, state);
+       state->scripts->scripts[0].status = fork_child_for_script(ctdb, state);
+       if (state->scripts->scripts[0].status != 0) {
+               /* Callback is called from destructor, with fail result. */
+               talloc_free(state);
+               return 0;
+       }
 
        if (!timeval_is_zero(&state->timeout)) {
                event_add_timed(ctdb->ev, state, timeval_current_ofs(state->timeout.tv_sec, state->timeout.tv_usec), ctdb_event_script_timeout, state);
        } else {
                DEBUG(DEBUG_ERR, (__location__ " eventscript %s %s called with no timeout\n",
-                                 call_names[state->call], state->options));
+                                 ctdb_eventscript_call_names[state->call],
+                                 state->options));
        }
 
        return 0;
@@ -955,7 +841,7 @@ int ctdb_event_script_args(struct ctdb_context *ctdb, enum ctdb_eventscript_call
        if (status.status == -ETIME) {
                DEBUG(DEBUG_ERR, (__location__ " eventscript for '%s' timedout."
                                  " Immediately banning ourself for %d seconds\n",
-                                 call_names[call],
+                                 ctdb_eventscript_call_names[call],
                                  ctdb->tunable.recovery_ban_period));
                ctdb_ban_self(ctdb);
        }
@@ -1004,9 +890,9 @@ static const char *get_call(const char *p, enum ctdb_eventscript_call *call)
        p += strspn(p, " \t");
 
        /* See if we match any. */
-       for (*call = 0; *call < ARRAY_SIZE(call_names); (*call)++) {
-               len = strlen(call_names[*call]);
-               if (strncmp(p, call_names[*call], len) == 0) {
+       for (*call = 0; *call < CTDB_EVENT_MAX; (*call)++) {
+               len = strlen(ctdb_eventscript_call_names[*call]);
+               if (strncmp(p, ctdb_eventscript_call_names[*call], len) == 0) {
                        /* If end of string or whitespace, we're done. */
                        if (strcspn(p + len, " \t") == 0) {
                                return p + len;