summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonnie Sahlberg <ronniesahlberg@gmail.com>2010-11-10 12:11:11 +1100
committerRonnie Sahlberg <ronniesahlberg@gmail.com>2010-11-10 14:55:24 +1100
commit6fa8e1fddb621e42b5a18b2fdccf30e0089ee332 (patch)
tree14a480cd07faaf0727536b3a936852ffd63bbb2f
parenta6ed66dfd048dc2c7b77ec542336f9fb01f064f1 (diff)
downloadsamba-6fa8e1fddb621e42b5a18b2fdccf30e0089ee332.tar.gz
samba-6fa8e1fddb621e42b5a18b2fdccf30e0089ee332.tar.xz
samba-6fa8e1fddb621e42b5a18b2fdccf30e0089ee332.zip
when we load the public address file, at the same time check if we are already hosting the public address, if so, set ourselves up as the pnn for that address
(This used to be ctdb commit 0f2a2dac91a61be188c3578c8bb89d47cbf9a0f8)
-rw-r--r--ctdb/server/ctdb_takeover.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index 87a97d53db..27c9ac0723 100644
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -895,6 +895,10 @@ static int ctdb_add_public_address(struct ctdb_context *ctdb,
vnn->public_address = *addr;
vnn->public_netmask_bits = mask;
vnn->pnn = -1;
+ if (ctdb_sys_have_ip(addr)) {
+ DEBUG(DEBUG_ERR,("We are already hosting public address '%s'\n", ctdb_addr_to_str(addr)));
+ vnn->pnn = ctdb->pnn;
+ }
for (i=0; vnn->ifaces[i]; i++) {
ret = ctdb_add_local_iface(ctdb, vnn->ifaces[i]);