[SCM] CTDB repository - branch master updated - ctdb-1.0.113-77-g144c69b

Ronnie Sahlberg sahlberg at samba.org
Tue Feb 9 00:26:54 MST 2010


The branch, master has been updated
       via  144c69b633eeb17e120f962162feed6de3dc16a6 (commit)
      from  f4eb41cd3a1099da8265351818fba9bd4688a188 (commit)

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


- Log -----------------------------------------------------------------
commit 144c69b633eeb17e120f962162feed6de3dc16a6
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Tue Feb 9 18:34:47 2010 +1100

    commands that relate to manual failover of ip addresses (moveip)
    can sometimes take long so allow for a longer timeout for the controls used.

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

Summary of changes:
 tools/ctdb.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/tools/ctdb.c b/tools/ctdb.c
index dbc8b47..406b86a 100644
--- a/tools/ctdb.c
+++ b/tools/ctdb.c
@@ -45,6 +45,7 @@ static struct {
 } options;
 
 #define TIMELIMIT() timeval_current_ofs(options.timelimit, 0)
+#define LONGTIMELIMIT() timeval_current_ofs(options.timelimit*10, 0)
 
 #ifdef CTDB_VERS
 static int control_version(struct ctdb_context *ctdb, int argc, const char **argv)
@@ -996,7 +997,6 @@ static int control_get_tickles(struct ctdb_context *ctdb, int argc, const char *
 }
 
 
-
 static int move_ip(struct ctdb_context *ctdb, ctdb_sock_addr *addr, uint32_t pnn)
 {
 	struct ctdb_all_public_ips *ips;
@@ -1055,7 +1055,7 @@ static int move_ip(struct ctdb_context *ctdb, ctdb_sock_addr *addr, uint32_t pnn
        	nodes = list_of_active_nodes_except_pnn(ctdb, nodemap, tmp_ctx, pnn);
 	ret = ctdb_client_async_control(ctdb, CTDB_CONTROL_RELEASE_IP,
 					nodes, 0,
-					TIMELIMIT(),
+					LONGTIMELIMIT(),
 					false, data,
 					NULL, NULL,
 					NULL);
@@ -1065,7 +1065,7 @@ static int move_ip(struct ctdb_context *ctdb, ctdb_sock_addr *addr, uint32_t pnn
 		return -1;
 	}
 
-	ret = ctdb_ctrl_takeover_ip(ctdb, TIMELIMIT(), pnn, &ip);
+	ret = ctdb_ctrl_takeover_ip(ctdb, LONGTIMELIMIT(), pnn, &ip);
 	if (ret != 0) {
 		DEBUG(DEBUG_ERR,("Failed to take over IP on node %d\n", pnn));
 		talloc_free(tmp_ctx);


-- 
CTDB repository


More information about the samba-cvs mailing list