BUG/MINOR: cli: Wait for the last ACK when FDs are xferred from the old worker

On reload, the new worker requests bound FDs to the old one. The old worker
sends them in message of at most 252 FDs. Each message is acknowledged by
the new worker. All messages sent or received by the old worker are handled
manually via sendmsg/recv syscalls. So the old worker must be sure consume
all the ACK replies. However, the last one was never consumed. So it was
considered as a command by the CLI applet. This issue was hidden since
recently. But it was the root cause of the issue #2862.

Note this last ack is also the first one when there are less than 252 FDs to
transfer.

This patch must be backported to all stable versions.

(cherry picked from commit 49b7bcf583261efedabad5ba15c4026f2e713c61)
Signed-off-by: Willy Tarreau <w@1wt.eu>

diff --git a/src/cli.c b/src/cli.c
index 99c9a9f..d8184cd 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -2442,6 +2442,16 @@ static int _getsocks(char **args, char *payload, struct appctx *appctx, void *pr
                        ha_warning("Failed to transfer sockets\n");
                        goto out;
                }
+
+               /* Wait for an ack */
+               do {
+                       ret = recv(fd, &tot_fd_nb, sizeof(tot_fd_nb), 0);
+               } while (ret == -1 && errno == EINTR);
+
+               if (ret <= 0) {
+                       ha_warning("Unexpected error while transferring sockets\n");
+                       goto out;
+               }
        }
 
 out: