MINOR: stats: Report max times in addition of the averages for sessions
Now, for the sessions, the maximum times (queue, connect, response, total) are
reported in addition of the averages over the last 1024 connections. These
values are called qtime_max, ctime_max, rtime_max and ttime_max.
This patch is related to #272.
(cherry picked from commit 0d1c2a65e8370a770d0160074f0d505a6014250e)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
[Cf: Forgot to backport this patch in 2.0. It is required to build the
Prometheus exporter]
diff --git a/src/stats.c b/src/stats.c
index 7024e7f..992005a 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -246,7 +246,11 @@
[ST_F_CACHE_LOOKUPS] = "cache_lookups",
[ST_F_CACHE_HITS] = "cache_hits",
[ST_F_SRV_ICUR] = "srv_icur",
- [ST_F_SRV_ILIM] = "src_ilim"
+ [ST_F_SRV_ILIM] = "src_ilim",
+ [ST_F_QT_MAX] = "qtime_max",
+ [ST_F_CT_MAX] = "ctime_max",
+ [ST_F_RT_MAX] = "rtime_max",
+ [ST_F_TT_MAX] = "ttime_max",
};
/* one line of info */
@@ -1047,12 +1051,16 @@
U2H(stats[ST_F_WREW].u.u64));
}
- chunk_appendf(out, "<tr><th colspan=3>Avg over last 1024 success. conn.</th></tr>");
- chunk_appendf(out, "<tr><th>- Queue time:</th><td>%s</td><td>ms</td></tr>", U2H(stats[ST_F_QTIME].u.u32));
- chunk_appendf(out, "<tr><th>- Connect time:</th><td>%s</td><td>ms</td></tr>", U2H(stats[ST_F_CTIME].u.u32));
+ chunk_appendf(out, "<tr><th colspan=3>Max / Avg over last 1024 success. conn.</th></tr>");
+ chunk_appendf(out, "<tr><th>- Queue time:</th><td>%s / %s</td><td>ms</td></tr>",
+ U2H(stats[ST_F_QT_MAX].u.u32), U2H(stats[ST_F_QTIME].u.u32));
+ chunk_appendf(out, "<tr><th>- Connect time:</th><td>%s / %s</td><td>ms</td></tr>",
+ U2H(stats[ST_F_CT_MAX].u.u32), U2H(stats[ST_F_CTIME].u.u32));
if (strcmp(field_str(stats, ST_F_MODE), "http") == 0)
- chunk_appendf(out, "<tr><th>- Response time:</th><td>%s</td><td>ms</td></tr>", U2H(stats[ST_F_RTIME].u.u32));
- chunk_appendf(out, "<tr><th>- Total time:</th><td>%s</td><td>ms</td></tr>", U2H(stats[ST_F_TTIME].u.u32));
+ chunk_appendf(out, "<tr><th>- Responses time:</th><td>%s / %s</td><td>ms</td></tr>",
+ U2H(stats[ST_F_RT_MAX].u.u32), U2H(stats[ST_F_RTIME].u.u32));
+ chunk_appendf(out, "<tr><th>- Total time:</th><td>%s / %s</td><td>ms</td></tr>",
+ U2H(stats[ST_F_TT_MAX].u.u32), U2H(stats[ST_F_TTIME].u.u32));
chunk_appendf(out,
"</table></div></u></td>"
@@ -1261,8 +1269,7 @@
"<tr><th>Cache lookups:</th><td>%s</td></tr>"
"<tr><th>Cache hits:</th><td>%s</td><td>(%d%%)</td></tr>"
"<tr><th>Failed hdr rewrites:</th><td>%s</td></tr>"
- "<tr><th colspan=3>Avg over last 1024 success. conn.</th></tr>"
- "",
+ "",
U2H(stats[ST_F_CONNECT].u.u64),
U2H(stats[ST_F_REUSE].u.u64),
(stats[ST_F_CONNECT].u.u64 + stats[ST_F_REUSE].u.u64) ?
@@ -1284,11 +1291,16 @@
U2H(stats[ST_F_WREW].u.u64));
}
- chunk_appendf(out, "<tr><th>- Queue time:</th><td>%s</td><td>ms</td></tr>", U2H(stats[ST_F_QTIME].u.u32));
- chunk_appendf(out, "<tr><th>- Connect time:</th><td>%s</td><td>ms</td></tr>", U2H(stats[ST_F_CTIME].u.u32));
+ chunk_appendf(out, "<tr><th colspan=3>Max / Avg over last 1024 success. conn.</th></tr>");
+ chunk_appendf(out, "<tr><th>- Queue time:</th><td>%s / %s</td><td>ms</td></tr>",
+ U2H(stats[ST_F_QT_MAX].u.u32), U2H(stats[ST_F_QTIME].u.u32));
+ chunk_appendf(out, "<tr><th>- Connect time:</th><td>%s / %s</td><td>ms</td></tr>",
+ U2H(stats[ST_F_CT_MAX].u.u32), U2H(stats[ST_F_CTIME].u.u32));
if (strcmp(field_str(stats, ST_F_MODE), "http") == 0)
- chunk_appendf(out, "<tr><th>- Response time:</th><td>%s</td><td>ms</td></tr>", U2H(stats[ST_F_RTIME].u.u32));
- chunk_appendf(out, "<tr><th>- Total time:</th><td>%s</td><td>ms</td></tr>", U2H(stats[ST_F_TTIME].u.u32));
+ chunk_appendf(out, "<tr><th>- Responses time:</th><td>%s / %s</td><td>ms</td></tr>",
+ U2H(stats[ST_F_RT_MAX].u.u32), U2H(stats[ST_F_RTIME].u.u32));
+ chunk_appendf(out, "<tr><th>- Total time:</th><td>%s / %s</td><td>ms</td></tr>",
+ U2H(stats[ST_F_TT_MAX].u.u32), U2H(stats[ST_F_TTIME].u.u32));
chunk_appendf(out,
"</table></div></u></td>"
@@ -1803,6 +1815,11 @@
stats[ST_F_RTIME] = mkf_u32(FN_AVG, swrate_avg(sv->counters.d_time, TIME_STATS_SAMPLES));
stats[ST_F_TTIME] = mkf_u32(FN_AVG, swrate_avg(sv->counters.t_time, TIME_STATS_SAMPLES));
+ stats[ST_F_QT_MAX] = mkf_u32(FN_MAX, sv->counters.qtime_max);
+ stats[ST_F_CT_MAX] = mkf_u32(FN_MAX, sv->counters.ctime_max);
+ stats[ST_F_RT_MAX] = mkf_u32(FN_MAX, sv->counters.dtime_max);
+ stats[ST_F_TT_MAX] = mkf_u32(FN_MAX, sv->counters.ttime_max);
+
if (flags & ST_SHLGNDS) {
switch (addr_to_str(&sv->addr, str, sizeof(str))) {
case AF_INET:
@@ -1930,6 +1947,11 @@
stats[ST_F_RTIME] = mkf_u32(FN_AVG, swrate_avg(px->be_counters.d_time, TIME_STATS_SAMPLES));
stats[ST_F_TTIME] = mkf_u32(FN_AVG, swrate_avg(px->be_counters.t_time, TIME_STATS_SAMPLES));
+ stats[ST_F_QT_MAX] = mkf_u32(FN_MAX, px->be_counters.qtime_max);
+ stats[ST_F_CT_MAX] = mkf_u32(FN_MAX, px->be_counters.ctime_max);
+ stats[ST_F_RT_MAX] = mkf_u32(FN_MAX, px->be_counters.dtime_max);
+ stats[ST_F_TT_MAX] = mkf_u32(FN_MAX, px->be_counters.ttime_max);
+
return 1;
}