BUG/MINOR: server: decrement session idle_conns on del server

When a server is deleted, each of its idle connections are removed. This
is also performed for every private connections stored on sessions which
referenced the target server.

As mentionned above, these private connections are idle, guaranteed by
srv_check_for_deletion(). A BUG_ON() on CO_FL_SESS_IDLE is already
present to guarantee this. Thus, these connections are accounted on the
session to enforce max-session-srv-conns limit.

However, this counter is not decremented during private conns cleanup on
"del server" handler. This patch fixes this by adding a decrement for
every private connections removed via "del server".

This should be backported up to 3.0.

diff --git a/src/server.c b/src/server.c
index b9f330f28a7ccec76f045003bac1e0343b854e2c..d75d8f39ec2f4698031d2f3e69fbc6aabfc1a20b 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -6434,10 +6434,11 @@ static int cli_parse_delete_server(char **args, char *payload, struct appctx *ap
 
                        /* Only idle connections should be present if srv_check_for_deletion() is true. */
                        BUG_ON(!(conn->flags & CO_FL_SESS_IDLE));
+                       --((struct session *)conn->owner)->idle_conns;
 
                        LIST_DEL_INIT(&conn->sess_el);
                        conn->owner = NULL;
-                       conn->flags &= ~CO_FL_SESS_IDLE;
+
                        if (sess_conns->tid != tid) {
                                if (conn->mux && conn->mux->takeover)
                                        conn->mux->takeover(conn, sess_conns->tid, 1);