don't start the transport connecting to the other nodes until after the startup event script has run

(This used to be ctdb commit afca3cc74211aa2e18b1f74d36b2add8dffcfdc7)

1 files changed, 13 insertions, 2 deletions

diff --git a/ctdb/tcp/tcp_init.c b/ctdb/tcp/tcp_init.c
index 35b43bd5e2..665336e947 100644
--- a/ctdb/tcp/tcp_init.c
+++ b/ctdb/tcp/tcp_init.c
@@ -46,9 +46,9 @@ static int ctdb_tcp_add_node(struct ctdb_node *node)
 }
 
 /*
-  start the protocol going
+  initialise transport structures
 */
-static int ctdb_tcp_start(struct ctdb_context *ctdb)
+static int ctdb_tcp_initialise(struct ctdb_context *ctdb)
 {
 	int i;
 
@@ -59,6 +59,16 @@ static int ctdb_tcp_start(struct ctdb_context *ctdb)
 		}
 	}
 	
+	return 0;
+}
+
+/*
+  start the protocol going
+*/
+static int ctdb_tcp_start(struct ctdb_context *ctdb)
+{
+	int i;
+
 	/* listen on our own address */
 	if (ctdb_tcp_listen(ctdb) != 0) return -1;
 
@@ -90,6 +100,7 @@ static void *ctdb_tcp_allocate_pkt(TALLOC_CTX *mem_ctx, size_t size)
 
 
 static const struct ctdb_methods ctdb_tcp_methods = {
+	.initialise   = ctdb_tcp_initialise,
 	.start        = ctdb_tcp_start,
 	.queue_pkt    = ctdb_tcp_queue_pkt,
 	.add_node     = ctdb_tcp_add_node,