summaryrefslogtreecommitdiffstats
path: root/ctdb
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-12-21 19:18:10 +0100
committerStefan Metzmacher <metze@samba.org>2010-01-20 11:11:01 +0100
commit179c098e8676afa3635adb264a6d295f0e6213f6 (patch)
treeee39427451e9594b19c9f8cecaa60b376b800d53 /ctdb
parent5d2c3ef65680ad6b77592735b7a1dc3e639f29cd (diff)
downloadsamba-179c098e8676afa3635adb264a6d295f0e6213f6.tar.gz
samba-179c098e8676afa3635adb264a6d295f0e6213f6.tar.xz
samba-179c098e8676afa3635adb264a6d295f0e6213f6.zip
server: start with disabled interfaces and let the event scripts enable the interfaces explicit
This makes sure that we don't get public addresses assigned during the initial recovery and remove them again in the startup event. metze (This used to be ctdb commit f872e8c63a2f8979e6a0d088630575bdd4d7b4f1)
Diffstat (limited to 'ctdb')
-rw-r--r--ctdb/server/ctdb_takeover.c2
-rwxr-xr-xctdb/tests/events.d/00.test7
2 files changed, 7 insertions, 2 deletions
diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index 7c26d3787ff..a924cc76b99 100644
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -65,7 +65,7 @@ static int ctdb_add_local_iface(struct ctdb_context *ctdb, const char *iface)
CTDB_NO_MEMORY_FATAL(ctdb, i);
i->name = talloc_strdup(i, iface);
CTDB_NO_MEMORY(ctdb, i->name);
- i->link_up = true;
+ i->link_up = false;
DLIST_ADD(ctdb->ifaces, i);
diff --git a/ctdb/tests/events.d/00.test b/ctdb/tests/events.d/00.test
index 877e47b6ef1..d2dcf0a95f1 100755
--- a/ctdb/tests/events.d/00.test
+++ b/ctdb/tests/events.d/00.test
@@ -22,7 +22,12 @@ case $cmd in
;;
startup)
echo "ctdb startup event"
- exit 0;
+ IFACES=`ctdb ifaces -Y | grep -v '^:Name:LinkStatus:References:'`
+ for I in $IFACES; do
+ IFACE=`echo -n "$I" | cut -d ':' -f2`
+ ctdb setifacelink $IFACE up
+ done
+ exit 0;
;;
takeip)