Attachment 15057 Details for Bug 13888 – Patch for 4.9 and 4.10

[patch] Patch for 4.9 and 4.10

BZ13888.patch (text/plain), 1.47 KB, created by Martin Schwenke on 2019-04-13 01:59:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Schwenke

Created: 2019-04-13 01:59:29 UTC

Size: 1.47 KB

patch

obsolete

>From 933943b938c7368bf54f5a43ed4bae4b62977f68 Mon Sep 17 00:00:00 2001
>From: Martin Schwenke <martin@meltin.net>
>Date: Fri, 5 Apr 2019 16:17:35 +1100
>Subject: [PATCH] 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 <martin@meltin.net>
>Reviewed-by: Amitay Isaacs <amitay@gmail.com>
>(cherry picked from commit 38dc6d11a26c2e9a2cae7927321f2216ceb1c5ec)
>---
> ctdb/tcp/tcp_connect.c | 3 +++
> 1 file changed, 3 insertions(+)
>
>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);
> }
> 
> 
>-- 
>2.20.1
>

Flags:

amitay: review+

Actions: View

Attachments on bug 13888: 15057