ctdb-tcp: Only mark a node connected if both directions are up

[garming/samba-autobuild/.git] / ctdb / tcp / tcp_connect.c

diff --git a/ctdb/tcp/tcp_connect.c b/ctdb/tcp/tcp_connect.c
index 4374242015c5bd7d9e5f557e2fa904336cb3feff..fd635b9abf2fe7d40991bf34f5c695a2d369b6c9 100644 (file)
--- a/ctdb/tcp/tcp_connect.c
+++ b/ctdb/tcp/tcp_connect.c
@@ -148,8 +148,14 @@ static void ctdb_node_connect_write(struct tevent_context *ev,
        /* the queue subsystem now owns this fd */
        tnode->out_fd = -1;
 
-       /* tell the ctdb layer we are connected */
-       node->ctdb->upcalls->node_connected(node);
+       /*
+        * Mark the node to which this connection has been established
+        * as connected, but only if the corresponding listening
+        * socket is also connected
+        */
+       if (tnode->in_fd != -1) {
+               node->ctdb->upcalls->node_connected(node);
+       }
 }
 
 
@@ -343,7 +349,15 @@ static void ctdb_listen_event(struct tevent_context *ev, struct tevent_fd *fde,
        }
 
        tnode->in_fd = fd;
-}
+
+       /*
+       * Mark the connecting node as connected, but only if the
+       * corresponding outbound connected is also up
+       */
+       if (tnode->out_queue != NULL) {
+               node->ctdb->upcalls->node_connected(node);
+       }
+ }
 
 
 /*