diff options
author | Andrew Tridgell <tridge@samba.org> | 2007-05-30 13:26:50 +1000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2007-05-30 13:26:50 +1000 |
commit | 8ed48aac5100933d5f81836b3d33e646af7a3819 (patch) | |
tree | aa2a5b6e62c4fc0fdfdc973d0309a4b982b9e4d8 /ctdb/ib | |
parent | 3eb96b4553a6cad3b317ab1bffd4779f747dd665 (diff) | |
download | samba-8ed48aac5100933d5f81836b3d33e646af7a3819.tar.gz |
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)
Diffstat (limited to 'ctdb/ib')
-rw-r--r-- | ctdb/ib/ibw_ctdb_init.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/ctdb/ib/ibw_ctdb_init.c b/ctdb/ib/ibw_ctdb_init.c index 66919568df5..b41c61687bc 100644 --- a/ctdb/ib/ibw_ctdb_init.c +++ b/ctdb/ib/ibw_ctdb_init.c @@ -70,9 +70,9 @@ static int ctdb_ibw_add_node(struct ctdb_node *node) } /* - * Start infiniband + * initialise infiniband */ -static int ctdb_ibw_start(struct ctdb_context *ctdb) +static int ctdb_ibw_initialise(struct ctdb_context *ctdb) { int i, ret; @@ -88,6 +88,17 @@ static int ctdb_ibw_start(struct ctdb_context *ctdb) } } + return 0; +} + + +/* + * Start infiniband + */ +static int ctdb_ibw_start(struct ctdb_context *ctdb) +{ + int i, ret; + /* listen on our own address */ if (ctdb_ibw_listen(ctdb, 10)) /* TODO: backlog as param */ return -1; @@ -190,6 +201,7 @@ static int ctdb_ibw_stop(struct ctdb_context *cctx) #endif /* __NOTDEF__ */ static const struct ctdb_methods ctdb_ibw_methods = { + .initialise= ctdb_ibw_initialise, .start = ctdb_ibw_start, .queue_pkt = ctdb_ibw_queue_pkt, .add_node = ctdb_ibw_add_node, |