You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
52 lines
1.9 KiB
52 lines
1.9 KiB
commit 5550143cd6de58c6e733e389c6946e3dd26e89c0
|
|
Author: Willy Tarreau <w@1wt.eu>
|
|
Date: Tue Aug 7 10:44:58 2018 +0200
|
|
|
|
BUG/MEDIUM: queue: prevent a backup server from draining the proxy's connections
|
|
|
|
When switching back from a backup to an active server, the backup server
|
|
currently continues to drain the proxy's connections, which is a problem
|
|
because it's not expected to be able to pick them.
|
|
|
|
This patch ensures that a backup server will only pick backend connections
|
|
if there is no active server and it is the selected backup server or all
|
|
backup servers are supposed to be used.
|
|
|
|
This issue seems to have existed forever, so this fix should be backported
|
|
to all stable versions.
|
|
|
|
(cherry picked from commit a8694654ba021bf1e0e560a98ab5e70dc44d212e)
|
|
Signed-off-by: Willy Tarreau <w@1wt.eu>
|
|
|
|
diff --git a/src/queue.c b/src/queue.c
|
|
index 1c730c75..b0b89426 100644
|
|
--- a/src/queue.c
|
|
+++ b/src/queue.c
|
|
@@ -117,7 +117,10 @@ static int pendconn_process_next_strm(struct server *srv, struct proxy *px)
|
|
}
|
|
|
|
ps_found:
|
|
- if (srv_currently_usable(rsrv) && px->nbpend) {
|
|
+ if (srv_currently_usable(rsrv) && px->nbpend &&
|
|
+ (!(srv->flags & SRV_F_BACKUP) ||
|
|
+ (!px->srv_act &&
|
|
+ (srv == px->lbprm.fbck || (px->options & PR_O_USE_ALL_BK))))) {
|
|
struct pendconn *pp;
|
|
|
|
list_for_each_entry(pp, &px->pendconns, list) {
|
|
@@ -287,6 +290,15 @@ int pendconn_grab_from_px(struct server *s)
|
|
if (!srv_currently_usable(s))
|
|
return 0;
|
|
|
|
+ /* if this is a backup server and there are active servers or at
|
|
+ * least another backup server was elected, then this one must
|
|
+ * not dequeue requests from the proxy.
|
|
+ */
|
|
+ if ((s->flags & SRV_F_BACKUP) &&
|
|
+ (s->proxy->srv_act ||
|
|
+ ((s != s->proxy->lbprm.fbck) && !(s->proxy->options & PR_O_USE_ALL_BK))))
|
|
+ return 0;
|
|
+
|
|
HA_SPIN_LOCK(PROXY_LOCK, &s->proxy->lock);
|
|
maxconn = srv_dynamic_maxconn(s);
|
|
list_for_each_entry_safe(p, pback, &s->proxy->pendconns, list) {
|