From: Martin Schwenke Date: Fri, 5 Apr 2019 05:17:35 +0000 (+1100) Subject: ctdb-daemon: Revert "We can not assume that just because we could complete a TCP... X-Git-Tag: samba-4.11.0rc1~1328 X-Git-Url: http://git.samba.org/samba.git/?p=vlendec%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=38dc6d11a26c2e9a2cae7927321f2216ceb1c5ec ctdb-daemon: Revert "We can not assume that just because we could complete a TCP handshake" We also can not assume that nodes can be marked as connected via only the keepalive mechanism. Keepalives are not sent to disconnected nodes so, in the absence of other packets (e.g. broadcasts), 2 nodes may never become marked as connected to each other. Revert to marking nodes as connected in the TCP transport code. If a connection is to a non(-operational) ctdbd then it will revert to disconnected after a short while and may actually flap. This should be rare. This reverts commit 66919db3d7ab1e091223faf515b183af8bfddc83. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13888 Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- diff --git a/ctdb/tcp/tcp_connect.c b/ctdb/tcp/tcp_connect.c index 13452a5e83b..385547e0e78 100644 --- a/ctdb/tcp/tcp_connect.c +++ b/ctdb/tcp/tcp_connect.c @@ -122,6 +122,9 @@ static void ctdb_node_connect_write(struct tevent_context *ev, /* the queue subsystem now owns this fd */ tnode->fd = -1; + + /* tell the ctdb layer we are connected */ + node->ctdb->upcalls->node_connected(node); }