diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2014-03-28 13:44:34 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2014-03-31 07:20:48 +0200 |
| commit | 7667da659042d82d26bfdcbd79588a6b8e4e3edf (patch) | |
| tree | b707075ce29402ab951ad1fbfe5786ed3e8edd3a | |
| parent | a2c34798782a1e4783c258d4e1950a2150d70e18 (diff) | |
| download | samba-7667da659042d82d26bfdcbd79588a6b8e4e3edf.tar.gz samba-7667da659042d82d26bfdcbd79588a6b8e4e3edf.tar.xz samba-7667da659042d82d26bfdcbd79588a6b8e4e3edf.zip | |
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 <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Mon Mar 31 07:20:48 CEST 2014 on sn-devel-104
| -rw-r--r-- | ctdb/server/ctdb_call.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ctdb/server/ctdb_call.c b/ctdb/server/ctdb_call.c index 017bb81d99..1830b4a7c5 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); |