diff options
| author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2010-06-01 16:22:48 +1000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2010-06-01 16:22:48 +1000 |
| commit | 4136f2714578a9bc0e5632a21d287a50f9ec137a (patch) | |
| tree | 940c42a5603d1d06d123ecea54c626c6f8f09763 /ctdb/server | |
| parent | 004b849feb7ca47efcc26acabfd0a3e3a86e02b4 (diff) | |
| download | samba-4136f2714578a9bc0e5632a21d287a50f9ec137a.tar.gz samba-4136f2714578a9bc0e5632a21d287a50f9ec137a.tar.xz samba-4136f2714578a9bc0e5632a21d287a50f9ec137a.zip | |
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.
(This used to be ctdb commit 2d60f96680d16c2992e2a35517822f88c12538b7)
Diffstat (limited to 'ctdb/server')
| -rw-r--r-- | ctdb/server/ctdb_takeover.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c index e80e303281..52db386d7f 100644 --- a/ctdb/server/ctdb_takeover.c +++ b/ctdb/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?" |