RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-02 18:22:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: session: define flag to explicitely release listener on free

Browse Source 
When a session is allocated for a FE connection, session_free() is
responsible to call listener_release() to decrement listener connection
counters and resume listening.

Until now, <listener> member of session was tested inside session_free()
before invocating listener_release(). To highlight more explicitely the
relation between sessions and listeners, introduce a new flag
SESS_FL_RELEASE_LI. Only session with such flag set will invoke
listener_release() on their cleanup. Flag is set inside
session_accept_fd() on success.

This patch has no functional change. However, it will be useful to
implement session creation for rHTTP preconnect.
This commit is contained in:
Amaury Denoyelle 2024-05-21 16:44:26 +02:00
parent 808daa7cfb
commit 45b80aed70
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/haproxy/session-t.h
View File

@ -39,6 +39,7 @@
enum {
SESS_FL_NONE = 0x00000000, /* nothing */
SESS_FL_PREFER_LAST = 0x00000001, /* NTML authent, we should reuse last conn */
SESS_FL_RELEASE_LI = 0x00000002, /* session responsible to decrement listener counters on release */
};
/* max number of idle server connections kept attached to a session */

21
src/session.c
View File

@ -78,8 +78,12 @@ void session_free(struct session *sess)
struct connection *conn, *conn_back;
struct sess_priv_conns *pconns, *pconns_back;
if (sess->listener)
if (sess->flags & SESS_FL_RELEASE_LI) {
/* listener must be set for session used to account FE conns. */
BUG_ON(!sess->listener);
listener_release(sess->listener);
}
session_store_counters(sess);
pool_free(pool_head_stk_ctr, sess->stkctr);
vars_prune_per_sess(&sess->vars);
@ -285,12 +289,19 @@ int session_accept_fd(struct connection *cli_conn)
sess->task->process = session_expire_embryonic;
sess->task->expire = tick_add_ifset(now_ms, timeout);
task_queue(sess->task);
/* Session is responsible to decrement listener conns counters. */
sess->flags |= SESS_FL_RELEASE_LI;
return 1;
}
/* OK let's complete stream initialization since there is no handshake */
if (conn_complete_session(cli_conn) >= 0)
if (conn_complete_session(cli_conn) >= 0) {
/* Session is responsible to decrement listener conns counters. */
sess->flags |= SESS_FL_RELEASE_LI;
return 1;
}
/* if we reach here we have deliberately decided not to keep this
* session (e.g. tcp-request rule), so that's not an error we should
@ -300,9 +311,9 @@ int session_accept_fd(struct connection *cli_conn)
/* error unrolling */
out_free_sess:
/* prevent call to listener_release during session_free. It will be
* done below, for all errors. */
sess->listener = NULL;
/* SESS_FL_RELEASE_LI must not be set here as listener_release() is
* called manually for all errors.
*/
session_free(sess);
out_free_conn: