[SCM] CTDB repository - branch master updated - ctdb-1.0.114-109-g2d60f96

[Ronnie Sahlberg]

The branch, master has been updated
       via  2d60f96680d16c2992e2a35517822f88c12538b7 (commit)
      from  d938b80a1c409a9ec4b554ddca5b0d949be53d9e (commit)

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


- Log -----------------------------------------------------------------
commit 2d60f96680d16c2992e2a35517822f88c12538b7
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Tue Jun 1 16:22:48 2010 +1000

    When adding an ip at runtime, it might not yet have an iface assigned to it, so ensure that the next takover_ip call will fall through to accept the ip and add it.

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

Summary of changes:
 server/ctdb_takeover.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index e80e303..52db386 100644
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -588,6 +588,11 @@ int32_t ctdb_control_takeover_ip(struct ctdb_context *ctdb,
 		return -1;
 	}
 
+	if (vnn->iface == NULL && vnn->pnn == -1 && have_ip && best_iface != NULL) {
+		DEBUG(DEBUG_ERR,("Taking over newly created ip\n"));
+		have_ip = false;
+	}
+
 	if (vnn->iface == NULL && have_ip) {
 		DEBUG(DEBUG_CRIT,(__location__ " takeoverip of IP %s is known to the kernel, "
 				  "but we have no interface assigned, has someone manually configured it?"


-- 
CTDB repository