sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-05-27 17:05:51 +03:00
Code

dont reset the event script context everytime we start a new "ctdb eventscript ..."

Browse Source 
command.
Use the existing context used for non-monitor events

Multiple concurrent uses of "ctdb eventscript ..." could otherwise lead to a SEGV

(This used to be ctdb commit 80a8d728e9680040e00d24361dfc9367dd372a56)
This commit is contained in:
Ronnie Sahlberg 2009-11-19 11:03:51 +11:00
parent cc2d81a77c
commit ae209c74c8
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ctdb/include/ctdb_private.h
View File

@ -448,7 +448,6 @@ struct ctdb_context {
int start_as_disabled;
int start_as_stopped;
uint32_t event_script_timeouts; /* counting how many consecutive times an eventscript has timedout */
TALLOC_CTX *eventscripts_ctx; /* a context to hold data for the RUN_EVENTSCRIPTS control */
uint32_t *recd_ping_count;
TALLOC_CTX *release_ips_ctx; /* a context used to automatically drop all IPs if we fail to recover the node */
TALLOC_CTX *script_monitor_ctx; /* a context where we store results while running the monitor event */

11
ctdb/server/eventscript.c
View File

@ -952,7 +952,7 @@ struct eventscript_callback_state {
};
/*
called when takeip event finishes
called when a forced eventscript run has finished
*/
static void run_eventscripts_callback(struct ctdb_context *ctdb, int status,
void *private_data)
@ -985,14 +985,11 @@ int32_t ctdb_run_eventscripts(struct ctdb_context *ctdb,
int ret;
struct eventscript_callback_state *state;
/* kill off any previous invokations of forced eventscripts */
if (ctdb->eventscripts_ctx) {
talloc_free(ctdb->eventscripts_ctx);
if (ctdb->event_script_ctx == NULL) {
ctdb->event_script_ctx = talloc_zero(ctdb, struct ctdb_monitor_status);
}
ctdb->eventscripts_ctx = talloc_new(ctdb);
CTDB_NO_MEMORY(ctdb, ctdb->eventscripts_ctx);
state = talloc(ctdb->eventscripts_ctx, struct eventscript_callback_state);
state = talloc(ctdb->event_script_ctx, struct eventscript_callback_state);
CTDB_NO_MEMORY(ctdb, state);
state->c = talloc_steal(state, c);