diff options
| author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2009-09-09 10:57:39 +1000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2009-09-09 10:57:39 +1000 |
| commit | e578bed20ddc6fa4ca6de88b5bb6864e2bfda925 (patch) | |
| tree | d595bdca46215841acbae31f2df53bd3fab79f1c /ctdb/server/eventscript.c | |
| parent | 263d76f8c2536594adb679aace59a0981e2fcc97 (diff) | |
| download | samba-e578bed20ddc6fa4ca6de88b5bb6864e2bfda925.tar.gz samba-e578bed20ddc6fa4ca6de88b5bb6864e2bfda925.tar.xz samba-e578bed20ddc6fa4ca6de88b5bb6864e2bfda925.zip | |
dont force an election just because the ban flag differs across the cluster.
a simple push to resync this flag is sufficient
(This used to be ctdb commit 8903b858ddd3a016d9cf765187839814443a67ca)
Diffstat (limited to 'ctdb/server/eventscript.c')
| -rw-r--r-- | ctdb/server/eventscript.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ctdb/server/eventscript.c b/ctdb/server/eventscript.c index ce9229d5ac..1f77bf11c5 100644 --- a/ctdb/server/eventscript.c +++ b/ctdb/server/eventscript.c @@ -616,6 +616,8 @@ static void ctdb_event_script_handler(struct event_context *ev, struct fd_event read(state->fd[0], &rt, sizeof(rt)); + DEBUG(DEBUG_INFO,(__location__ " Eventscript %s finished with state %d\n", state->options, rt)); + talloc_set_destructor(state, NULL); talloc_free(state); callback(ctdb, rt, private_data); @@ -733,6 +735,8 @@ static int ctdb_event_script_callback_v(struct ctdb_context *ctdb, state->private_data = private_data; state->options = talloc_vasprintf(state, fmt, ap); CTDB_NO_MEMORY(ctdb, state->options); + + DEBUG(DEBUG_INFO,(__location__ " Starting eventscript %s\n", state->options)); ret = pipe(state->fd); if (ret != 0) { @@ -828,7 +832,9 @@ int ctdb_event_script(struct ctdb_context *ctdb, const char *fmt, ...) struct callback_status status; va_start(ap, fmt); - ret = ctdb_event_script_callback_v(ctdb, timeval_zero(), tmp_ctx, event_script_callback, &status, fmt, ap); + ret = ctdb_event_script_callback_v(ctdb, + timeval_current_ofs(ctdb->tunable.script_timeout, 0), + tmp_ctx, event_script_callback, &status, fmt, ap); va_end(ap); if (ret != 0) { |