1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DEBUG: mux-spop: Review some trace messages to adjust the message or the level

Browse Source 
Some trace messages were not really accurrate, reporting a CLOSED connection
while only an error was reported on it. In addition, an TRACE_ERROR() was
used to report a short read on HELLO/DISCONNECT frames header. But it is not
an error. a TRACE_DEVEL() should be used instead.

This patch could be backported to 3.1 to ease future backports.
This commit is contained in:
Christopher Faulet 2025-05-14 09:39:03 +02:00
parent 6e46f0bf93
commit e2ae8a74e8
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mux_spop.c
View File

@ -2076,7 +2076,7 @@ static void spop_process_demux(struct spop_conn *spop_conn)
TRACE_STATE("receiving AGENT HELLO/DISCONNECT frame header", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR, spop_conn->conn); TRACE_STATE("receiving AGENT HELLO/DISCONNECT frame header", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR, spop_conn->conn);
if (!spop_get_frame_hdr(&spop_conn->dbuf, &hdr)) { if (!spop_get_frame_hdr(&spop_conn->dbuf, &hdr)) {
spop_conn->flags |= SPOP_CF_DEM_SHORT_READ; spop_conn->flags |= SPOP_CF_DEM_SHORT_READ;
TRACE_ERROR("header frame not available yet", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR, spop_conn->conn); TRACE_DEVEL("header frame not available yet", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR, spop_conn->conn);
goto done; goto done;
} }
@ -2132,7 +2132,7 @@ static void spop_process_demux(struct spop_conn *spop_conn)
if ((int)hdr.len < 0 || (int)hdr.len > spop_conn->max_frame_size) { if ((int)hdr.len < 0 || (int)hdr.len > spop_conn->max_frame_size) {
spop_conn_error(spop_conn, SPOP_ERR_BAD_FRAME_SIZE); spop_conn_error(spop_conn, SPOP_ERR_BAD_FRAME_SIZE);
TRACE_ERROR("invalid SPOP frame length", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn); TRACE_ERROR("invalid SPOP frame length", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn);
TRACE_STATE("switching to CLOSED", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn); TRACE_STATE("switching to ERROR", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn);
break; break;
} }
@ -2148,24 +2148,23 @@ static void spop_process_demux(struct spop_conn *spop_conn)
if (!(spop_conn->dff & SPOP_FRM_FL_FIN)) { if (!(spop_conn->dff & SPOP_FRM_FL_FIN)) {
spop_conn_error(spop_conn, SPOP_ERR_FRAG_NOT_SUPPORTED); spop_conn_error(spop_conn, SPOP_ERR_FRAG_NOT_SUPPORTED);
TRACE_ERROR("frame fragmentation not supported", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn); TRACE_ERROR("frame fragmentation not supported", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn);
TRACE_STATE("switching to CLOSED", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn); TRACE_STATE("switching to ERROR", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn);
break; break;
} }
if (!spop_conn->dsi && spop_conn->dft == SPOP_FRM_T_AGENT_ACK) { if (!spop_conn->dsi && spop_conn->dft == SPOP_FRM_T_AGENT_ACK) {
spop_conn_error(spop_conn, SPOP_ERR_INVALID); spop_conn_error(spop_conn, SPOP_ERR_INVALID);
TRACE_ERROR("invalid SPOP frame (ACK && dsi == 0)", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn); TRACE_ERROR("invalid SPOP frame (ACK && dsi == 0)", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn);
TRACE_STATE("switching to CLOSED", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn); TRACE_STATE("switching to ERROR", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn);
break; break;
} }
if (spop_conn->dsi && !spop_conn->dfi) { if (spop_conn->dsi && !spop_conn->dfi) {
spop_conn_error(spop_conn, SPOP_ERR_INVALID); spop_conn_error(spop_conn, SPOP_ERR_INVALID);
TRACE_ERROR("invalid SPOP frame (dsi != 0 && dfi == 0)", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn); TRACE_ERROR("invalid SPOP frame (dsi != 0 && dfi == 0)", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn);
TRACE_STATE("switching to CLOSED", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn); TRACE_STATE("switching to ERROR", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn);
break; break;
} }
} }
tmp_spop_strm = spop_conn_st_by_id(spop_conn, spop_conn->dsi); tmp_spop_strm = spop_conn_st_by_id(spop_conn, spop_conn->dsi);
if (tmp_spop_strm != spop_strm && spop_strm && spop_strm_sc(spop_strm) && if (tmp_spop_strm != spop_strm && spop_strm && spop_strm_sc(spop_strm) &&
(b_data(&spop_strm->rxbuf) || (b_data(&spop_strm->rxbuf) ||