diff options
| author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2009-10-28 16:11:54 +1100 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2009-10-28 16:11:54 +1100 |
| commit | e07ca4188634b01ba843bf223a07d1fb75464cc0 (patch) | |
| tree | 206594449d4e3f6bd9da47260676fcc156102d72 /ctdb/server/ctdb_recover.c | |
| parent | 3526bc830dc9b86f1c6afa973fd06591eea240c3 (diff) | |
| download | samba-e07ca4188634b01ba843bf223a07d1fb75464cc0.tar.gz samba-e07ca4188634b01ba843bf223a07d1fb75464cc0.tar.xz samba-e07ca4188634b01ba843bf223a07d1fb75464cc0.zip | |
change the eventscript handling to allow EventScriptTimeout for each individual script isntead of for the entire set of scripts
restructure the talloc hierarchy to allow this
(This used to be ctdb commit 64da4402c6ad485f1d0a604878a7b0c01a0ea5f0)
Diffstat (limited to 'ctdb/server/ctdb_recover.c')
| -rw-r--r-- | ctdb/server/ctdb_recover.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ctdb/server/ctdb_recover.c b/ctdb/server/ctdb_recover.c index 862168e97e..ccac8e62e6 100644 --- a/ctdb/server/ctdb_recover.c +++ b/ctdb/server/ctdb_recover.c @@ -963,7 +963,7 @@ int32_t ctdb_control_end_recovery(struct ctdb_context *ctdb, ctdb_disable_monitoring(ctdb); ret = ctdb_event_script_callback(ctdb, - timeval_current_ofs(ctdb->tunable.script_timeout, 0), + timeval_set(ctdb->tunable.script_timeout, 0), state, ctdb_end_recovery_callback, state, "recovered"); @@ -1017,7 +1017,7 @@ int32_t ctdb_control_start_recovery(struct ctdb_context *ctdb, ctdb_disable_monitoring(ctdb); ret = ctdb_event_script_callback(ctdb, - timeval_current_ofs(ctdb->tunable.script_timeout, 0), + timeval_set(ctdb->tunable.script_timeout, 0), state, ctdb_start_recovery_callback, state, "startrecovery"); @@ -1231,7 +1231,7 @@ int32_t ctdb_control_stop_node(struct ctdb_context *ctdb, struct ctdb_req_contro ctdb_disable_monitoring(ctdb); ret = ctdb_event_script_callback(ctdb, - timeval_current_ofs(ctdb->tunable.script_timeout, 0), + timeval_set(ctdb->tunable.script_timeout, 0), state, ctdb_stop_node_callback, state, "stopped"); |