From: Martin Schwenke Date: Tue, 5 Jul 2022 09:33:15 +0000 (+1000) Subject: ctdb-daemon: Fix printing of tickle ACKs X-Git-Tag: samba-4.17.0rc1~260 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3efa56aa61da952f869f43188b0d53a11c820ca0;p=thirdparty%2Fsamba.git ctdb-daemon: Fix printing of tickle ACKs Commit f5a20377347aba18700d010d4201775fc83a0b1b arguably got this back-to-front: 2022-07-27T09:50:01.985857+10:00 testn1 ctdbd[17820]: ../../ctdb/server/ctdb_takeover.c:514 sending TAKE_IP for '10.0.1.173' 2022-07-27T09:50:01.990601+10:00 testn1 ctdbd[17820]: Send TCP tickle ACK: 10.0.1.77:33004 -> 10.0.1.173:2049 2022-07-27T09:50:01.991323+10:00 testn1 ctdb-takeover[19758]: TAKEOVER_IP 10.0.1.173 succeeded on node 0 Unfortunately there is an inconsistency somewhere in the connection tracking code used for tickle ACKs, making this less than obvious. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs Autobuild-User(master): Amitay Isaacs Autobuild-Date(master): Thu Jul 28 09:02:08 UTC 2022 on sn-devel-184 --- diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c index 0fb8076ad55..4d2d0416752 100644 --- a/ctdb/server/ctdb_takeover.c +++ b/ctdb/server/ctdb_takeover.c @@ -402,7 +402,7 @@ static void ctdb_control_send_arp(struct tevent_context *ev, ret = ctdb_connection_to_buf(buf, sizeof(buf), tcon, - true, + false, " -> "); if (ret != 0) { strlcpy(buf, "UNKNOWN", sizeof(buf));