Rev 408: if there is no node available to take an IP, don't consider that an error in http://samba.org/~tridge/ctdb

tridge at samba.org tridge at samba.org
Thu May 31 01:22:45 GMT 2007


------------------------------------------------------------
revno: 408
revision-id: tridge at samba.org-20070531012243-kwca52t2ep7tkln8
parent: tridge at samba.org-20070531011407-fpaex23wc8bfm773
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Thu 2007-05-31 11:22:43 +1000
message:
  if there is no node available to take an IP, don't consider that an error
modified:
  takeover/ctdb_takeover.c       ctdb_takeover.c-20070525071636-a5n1ihghjtppy08r-2
=== modified file 'takeover/ctdb_takeover.c'
--- a/takeover/ctdb_takeover.c	2007-05-30 06:37:39 +0000
+++ b/takeover/ctdb_takeover.c	2007-05-31 01:22:43 +0000
@@ -361,6 +361,10 @@
 
 	/* tell all nodes to get their own IPs */
 	for (i=0;i<nodemap->num;i++) {
+		if (ctdb->nodes[i]->takeover_vnn == -1) {
+			/* this IP won't be taken over */
+			continue;
+		}
 		ret = ctdb_ctrl_takeover_ip(ctdb, TAKEOVER_TIMEOUT(), 
 					    ctdb->nodes[i]->takeover_vnn, 
 					    ctdb->nodes[i]->public_address);



More information about the samba-cvs mailing list