diff options
| author | Martin Schwenke <martin@meltin.net> | 2014-03-04 15:06:11 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2014-03-23 04:20:14 +0100 |
| commit | ecafbce1b1cf53ae8c3de9eb5201192f7fe1f67d (patch) | |
| tree | 87bd993b16c8bb9de746a0fe6443a98840d1f9c4 /ctdb | |
| parent | 87d58fd07b1294688b8fc6dbdf3dbb6cb12d3a80 (diff) | |
| download | samba-ecafbce1b1cf53ae8c3de9eb5201192f7fe1f67d.tar.gz samba-ecafbce1b1cf53ae8c3de9eb5201192f7fe1f67d.tar.xz samba-ecafbce1b1cf53ae8c3de9eb5201192f7fe1f67d.zip | |
ctdb-daemon: Do not disable monitoring when running eventscripts
This is racy and cbffbb7c2f406fc1d8ebad3c531cc2757232690e makes it
unnecessary.
The eventscript code still knows that monitor events are special
compared to other events. However, the general concept of monitoring
is no longer tangled up with running scripts.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/server/eventscript.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/ctdb/server/eventscript.c b/ctdb/server/eventscript.c index ed20124bb0a..bf95b2114b3 100644 --- a/ctdb/server/eventscript.c +++ b/ctdb/server/eventscript.c @@ -901,8 +901,6 @@ static void run_eventscripts_callback(struct ctdb_context *ctdb, int status, struct eventscript_callback_state *state = talloc_get_type(private_data, struct eventscript_callback_state); - ctdb_enable_monitoring(ctdb); - if (status != 0) { DEBUG(DEBUG_ERR,(__location__ " Failed to run eventscripts\n")); } @@ -966,14 +964,11 @@ int32_t ctdb_run_eventscripts(struct ctdb_context *ctdb, DEBUG(DEBUG_NOTICE,("Running eventscripts with arguments %s\n", indata.dptr)); - ctdb_disable_monitoring(ctdb); - ret = ctdb_event_script_callback(ctdb, state, run_eventscripts_callback, state, call, "%s", options); if (ret != 0) { - ctdb_enable_monitoring(ctdb); DEBUG(DEBUG_ERR,(__location__ " Failed to run eventscripts with arguments %s\n", indata.dptr)); talloc_free(state); return -1; |