From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 31 May 2007 01:22:43 +0000 (+1000)
Subject: if there is no node available to take an IP, don't consider that an error
X-Git-Tag: tevent-0.9.20~348^2~2623
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7ccb338862fd8843a6e5b478e4a86c16dc6ba3c8;p=thirdparty%2Fsamba.git

if there is no node available to take an IP, don't consider that an error
(This used to be ctdb commit fee6561626c7070418bc8f4d610a728329ac4bcc)
---

diff --git a/ctdb/takeover/ctdb_takeover.c b/ctdb/takeover/ctdb_takeover.c
index cadb1a80c34..cf65055f7be 100644
--- a/ctdb/takeover/ctdb_takeover.c
+++ b/ctdb/takeover/ctdb_takeover.c
@@ -361,6 +361,10 @@ int ctdb_takeover_run(struct ctdb_context *ctdb, struct ctdb_node_map *nodemap)
 
 	/* 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);