summaryrefslogtreecommitdiffstats
path: root/ctdb/tcp/tcp_init.c
diff options
context:
space:
mode:
authorRonnie sahlberg <ronniesahlberg@gmail.com>2007-04-10 12:39:25 +1000
committerRonnie sahlberg <ronniesahlberg@gmail.com>2007-04-10 12:39:25 +1000
commit91c39b485237d093362bcfcabcdd51b32bb6a371 (patch)
tree3bdb336cb82a8b4879edbd922a4e8050278d2c4b /ctdb/tcp/tcp_init.c
parent1f3f0ae56d2edae4541d7da8e3e0cd1607c62e70 (diff)
downloadsamba-91c39b485237d093362bcfcabcdd51b32bb6a371.tar.gz
samba-91c39b485237d093362bcfcabcdd51b32bb6a371.tar.xz
samba-91c39b485237d093362bcfcabcdd51b32bb6a371.zip
move the checking of the CONNECT_WAIT flag into the start method for tcp
(This used to be ctdb commit 44f3e4456d931af642192e034f84c961ab1fdcf0)
Diffstat (limited to 'ctdb/tcp/tcp_init.c')
-rw-r--r--ctdb/tcp/tcp_init.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/ctdb/tcp/tcp_init.c b/ctdb/tcp/tcp_init.c
index 0058e7ad85..0ab12790d4 100644
--- a/ctdb/tcp/tcp_init.c
+++ b/ctdb/tcp/tcp_init.c
@@ -46,6 +46,12 @@ int ctdb_tcp_start(struct ctdb_context *ctdb)
ctdb_tcp_node_connect, node);
}
+ if (ctdb->flags&CTDB_FLAG_CONNECT_WAIT) {
+ /* wait until all nodes are connected (should not be needed
+ outide of test code) */
+ ctdb_connect_wait(ctdb);
+ }
+
return 0;
}