[SCM] CTDB repository - branch master updated - 437752d002a108bcbbf6dc8bfb5dbf16dc5f1c58

[Ronnie Sahlberg]

The branch, master has been updated
       via  437752d002a108bcbbf6dc8bfb5dbf16dc5f1c58 (commit)
      from  6f6de0becd179be9eb9a6bf70562b090205ce196 (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 437752d002a108bcbbf6dc8bfb5dbf16dc5f1c58
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu May 22 16:33:36 2008 +1000

    restore a timeout value to the default settings instead of the hardcoded 3 second test value

-----------------------------------------------------------------------

Summary of changes:
 server/ctdb_persistent.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/server/ctdb_persistent.c b/server/ctdb_persistent.c
index df4c425..6a7a3eb 100644
--- a/server/ctdb_persistent.c
+++ b/server/ctdb_persistent.c
@@ -294,7 +294,7 @@ int32_t ctdb_control_update_record(struct ctdb_context *ctdb,
 	talloc_steal(state, c);
 
 	/* but we won't wait forever */
-	event_add_timed(ctdb->ev, state, timeval_current_ofs(3, 0),
+	event_add_timed(ctdb->ev, state, timeval_current_ofs(ctdb->tunable.control_timeout, 0),
 			ctdb_persistent_lock_timeout, state);
 
 	return 0;


-- 
CTDB repository