From: Willy Tarreau <w@1wt.eu>
Date: Wed, 21 Oct 2020 09:54:38 +0000 (+0200)
Subject: BUG/MINOR: queue: properly report redistributed connections
X-Git-Tag: v2.3-dev8~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef71f0194cfdaa9c201bece65e8c1ab3d16ed8a0;p=thirdparty%2Fhaproxy.git

BUG/MINOR: queue: properly report redistributed connections

In commit 5cd4bbd7a ("BUG/MAJOR: threads/queue: Fix thread-safety issues
on the queues management") the counter of transferred connections was
accidently lost, so that when a server goes down with connections in its
queue, it will always be reported that 0 connection were transferred.

This should be backported as far as 1.8 since the patch above was
backported there.
---

diff --git a/src/queue.c b/src/queue.c
index afc2ab8cf0..312c91fca5 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -416,6 +416,7 @@ int pendconn_redistribute(struct server *s)
 		p->strm_flags &= ~(SF_DIRECT | SF_ASSIGNED | SF_ADDR_SET);
 
 		task_wakeup(p->strm->task, TASK_WOKEN_RES);
+		xferred++;
 	}
 	return xferred;
 }