The branch, master has been updated via 7667da6 ctdb-readonly: Do not use hard-coded value for readonly revoke timeout from a2c3479 Revert "s4:tls_tstream: allow mode of SSL keyfile to be 0400, not only 0600"
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 7667da659042d82d26bfdcbd79588a6b8e4e3edf Author: Amitay Isaacs <ami...@gmail.com> Date: Fri Mar 28 13:44:34 2014 +1100 ctdb-readonly: Do not use hard-coded value for readonly revoke timeout In case of control timeouts, readonly revoke code currently aborts. This needs to be fixed. Meanwhile, using control_timeout instead of 5 seconds, increases the timeout to 60 seconds. Signed-off-by: Amitay Isaacs <ami...@gmail.com> Reviewed-by: Martin Schwenke <mar...@meltin.net> Autobuild-User(master): Amitay Isaacs <ami...@samba.org> Autobuild-Date(master): Mon Mar 31 07:20:48 CEST 2014 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: ctdb/server/ctdb_call.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/ctdb/server/ctdb_call.c b/ctdb/server/ctdb_call.c index 017bb81..1830b4a 100644 --- a/ctdb/server/ctdb_call.c +++ b/ctdb/server/ctdb_call.c @@ -1513,7 +1513,7 @@ static void revoke_send_cb(struct ctdb_context *ctdb, uint32_t pnn, void *privat struct ctdb_revoke_state *revoke_state = private_data; struct ctdb_client_control_state *state; - state = ctdb_ctrl_updaterecord_send(ctdb, revoke_state, timeval_current_ofs(5,0), pnn, revoke_state->ctdb_db, revoke_state->key, revoke_state->header, revoke_state->data); + state = ctdb_ctrl_updaterecord_send(ctdb, revoke_state, timeval_current_ofs(ctdb->tunable.control_timeout,0), pnn, revoke_state->ctdb_db, revoke_state->key, revoke_state->header, revoke_state->data); if (state == NULL) { DEBUG(DEBUG_ERR,("Failure to send update record to revoke readonly delegation\n")); revoke_state->status = -1; @@ -1548,7 +1548,7 @@ static int ctdb_revoke_all_delegations(struct ctdb_context *ctdb, struct ctdb_db ctdb_trackingdb_traverse(ctdb, tdata, revoke_send_cb, state); - event_add_timed(ctdb->ev, state, timeval_current_ofs(5, 0), ctdb_revoke_timeout_handler, state); + event_add_timed(ctdb->ev, state, timeval_current_ofs(ctdb->tunable.control_timeout, 0), ctdb_revoke_timeout_handler, state); while (state->finished == 0) { event_loop_once(ctdb->ev); -- Samba Shared Repository