diff options
| -rw-r--r-- | ctdb/server/ctdb_monitor.c | 5 | ||||
| -rw-r--r-- | ctdb/server/eventscript.c | 10 |
2 files changed, 14 insertions, 1 deletions
diff --git a/ctdb/server/ctdb_monitor.c b/ctdb/server/ctdb_monitor.c index f0879d0a77..7258d3957a 100644 --- a/ctdb/server/ctdb_monitor.c +++ b/ctdb/server/ctdb_monitor.c @@ -125,6 +125,11 @@ static void ctdb_health_callback(struct ctdb_context *ctdb, int status, void *p) rddata.dptr = (uint8_t *)&rd; rddata.dsize = sizeof(rd); + if (status == -ECANCELED) { + DEBUG(DEBUG_ERR,("Monitoring event was cancelled\n")); + goto after_change_status; + } + if (status == -ETIME) { ctdb->event_script_timeouts++; diff --git a/ctdb/server/eventscript.c b/ctdb/server/eventscript.c index c01fbad69e..722ebec6a9 100644 --- a/ctdb/server/eventscript.c +++ b/ctdb/server/eventscript.c @@ -58,7 +58,7 @@ struct ctdb_event_script_state { enum ctdb_eventscript_call call; const char *options; struct timeval timeout; - + unsigned int current; struct ctdb_scripts_wire *scripts; }; @@ -742,6 +742,14 @@ static int ctdb_event_script_callback_v(struct ctdb_context *ctdb, /* Kill off any running monitor events to run this event. */ if (ctdb->current_monitor) { + struct ctdb_event_script_state *ms = talloc_get_type(ctdb->current_monitor, struct ctdb_event_script_state); + + /* cancel it */ + if (ms->callback != NULL) { + ms->callback->fn(ctdb, -ECANCELED, ms->callback->private_data); + talloc_free(ms->callback); + } + /* Discard script status so we don't save to last_status */ talloc_free(ctdb->current_monitor->scripts); ctdb->current_monitor->scripts = NULL; |