mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-08 08:07:10 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: stream: Report rex/wex value using the sedesc date in trace messages

Browse Source 
Becasue read and write timeout are now detected using .lra and .fsb fields
of the stream-endpoint descriptor, it is better to also use these fields to
report read and write expiration date in trace messages. Especially because
old rex and wex fields will be removed.
This commit is contained in:
Christopher Faulet 2023-02-22 14:43:22 +01:00
parent 6e59e871bf
commit 03d5e62e13
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/stream.c
View File

@ -221,7 +221,7 @@ static void strm_trace(enum trace_level level, uint64_t mask, const struct trace
/* If txn defined, don't display all channel info */
if (src->verbosity == STRM_VERB_SIMPLE || txn) {
chunk_appendf(&trace_buf, " req=(%p .fl=0x%08x .exp=,%u)",
chunk_appendf(&trace_buf, " req=(%p .fl=0x%08x .exp=%u)",
req, req->flags, req->analyse_exp);
chunk_appendf(&trace_buf, " res=(%p .fl=0x%08x .exp=%u)",
res, res->flags, res->analyse_exp);
@ -3356,9 +3356,9 @@ static int stats_dump_full_strm_to_buffer(struct stconn *sc, struct stream *strm
(sc_ep_test(scf, SE_FL_T_MUX) ? "CONN" : (sc_ep_test(scf, SE_FL_T_APPLET) ? "APPCTX" : "NONE")),
scf->sedesc->se, sc_ep_get(scf), scf->wait_event.events);
chunk_appendf(&trash, " rex=%s",
sc_ep_rex(scf) ? human_time(TICKS_TO_MS(sc_ep_rex(scf) - now_ms), TICKS_TO_MS(1000)) : "<NEVER>");
sc_ep_rcv_ex(scf) ? human_time(TICKS_TO_MS(sc_ep_rcv_ex(scf) - now_ms), TICKS_TO_MS(1000)) : "<NEVER>");
chunk_appendf(&trash, " wex=%s\n",
sc_ep_wex(scf) ? human_time(TICKS_TO_MS(sc_ep_wex(scf) - now_ms), TICKS_TO_MS(1000)) : "<NEVER>");
sc_ep_snd_ex(scf) ? human_time(TICKS_TO_MS(sc_ep_snd_ex(scf) - now_ms), TICKS_TO_MS(1000)) : "<NEVER>");
if ((conn = sc_conn(scf)) != NULL) {
if (conn->mux && conn->mux->show_sd) {
@ -3402,9 +3402,9 @@ static int stats_dump_full_strm_to_buffer(struct stconn *sc, struct stream *strm
(sc_ep_test(scb, SE_FL_T_MUX) ? "CONN" : (sc_ep_test(scb, SE_FL_T_APPLET) ? "APPCTX" : "NONE")),
scb->sedesc->se, sc_ep_get(scb), scb->wait_event.events);
chunk_appendf(&trash, " rex=%s",
sc_ep_rex(scb) ? human_time(TICKS_TO_MS(sc_ep_rex(scb) - now_ms), TICKS_TO_MS(1000)) : "<NEVER>");
sc_ep_rcv_ex(scb) ? human_time(TICKS_TO_MS(sc_ep_rcv_ex(scb) - now_ms), TICKS_TO_MS(1000)) : "<NEVER>");
chunk_appendf(&trash, " wex=%s\n",
sc_ep_wex(scb) ? human_time(TICKS_TO_MS(sc_ep_wex(scb) - now_ms), TICKS_TO_MS(1000)) : "<NEVER>");
sc_ep_snd_ex(scb) ? human_time(TICKS_TO_MS(sc_ep_snd_ex(scb) - now_ms), TICKS_TO_MS(1000)) : "<NEVER>");
if ((conn = sc_conn(scb)) != NULL) {
if (conn->mux && conn->mux->show_sd) {
@ -3698,24 +3698,24 @@ static int cli_io_handler_dump_sess(struct appctx *appctx)
chunk_appendf(&trash," scf=[%d,%1xh,fd=%d",
curr_strm->scf->state, curr_strm->scf->flags, conn_fd(conn));
chunk_appendf(&trash, ",rex=%s",
sc_ep_rex(curr_strm->scf) ?
human_time(TICKS_TO_MS(sc_ep_rex(curr_strm->scf) - now_ms),
sc_ep_rcv_ex(curr_strm->scf) ?
human_time(TICKS_TO_MS(sc_ep_rcv_ex(curr_strm->scf) - now_ms),
TICKS_TO_MS(1000)) : "");
chunk_appendf(&trash,",wex=%s]",
sc_ep_wex(curr_strm->scf) ?
human_time(TICKS_TO_MS(sc_ep_wex(curr_strm->scf) - now_ms),
sc_ep_snd_ex(curr_strm->scf) ?
human_time(TICKS_TO_MS(sc_ep_snd_ex(curr_strm->scf) - now_ms),
TICKS_TO_MS(1000)) : "");
conn = sc_conn(curr_strm->scb);
chunk_appendf(&trash, " scb=[%d,%1xh,fd=%d",
curr_strm->scb->state, curr_strm->scb->flags, conn_fd(conn));
chunk_appendf(&trash, ",rex=%s",
sc_ep_rex(curr_strm->scb) ?
human_time(TICKS_TO_MS(sc_ep_rex(curr_strm->scb) - now_ms),
sc_ep_rcv_ex(curr_strm->scb) ?
human_time(TICKS_TO_MS(sc_ep_rcv_ex(curr_strm->scb) - now_ms),
TICKS_TO_MS(1000)) : "");
chunk_appendf(&trash, ",wex=%s]",
sc_ep_wex(curr_strm->scb) ?
human_time(TICKS_TO_MS(sc_ep_wex(curr_strm->scb) - now_ms),
sc_ep_snd_ex(curr_strm->scb) ?
human_time(TICKS_TO_MS(sc_ep_snd_ex(curr_strm->scb) - now_ms),
TICKS_TO_MS(1000)) : "");
chunk_appendf(&trash,