]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MINOR: compression: properly report compression stats in HTX mode
authorWilly Tarreau <w@1wt.eu>
Mon, 4 Feb 2019 10:48:03 +0000 (11:48 +0100)
committerWilly Tarreau <w@1wt.eu>
Mon, 4 Feb 2019 10:48:03 +0000 (11:48 +0100)
When HTX support was added to HTTP compression, a set of counters was missed,
namely comp_in and comp_byp, resulting in no stats being available for compression.

This must be backported to 1.9.

src/flt_http_comp.c

index cfe864e35a73eac75ca9873a87b7dd467acc116d..3c2ce365ec07b8134248e67be7206183d345d78a 100644 (file)
@@ -285,9 +285,15 @@ comp_http_payload(struct stream *s, struct filter *filter, struct http_msg *msg,
                flt_update_offsets(filter, msg->chn, to_forward - consumed);
 
        if (st->comp_ctx && st->comp_ctx->cur_lvl > 0) {
+               update_freq_ctr(&global.comp_bps_in, consumed);
+               HA_ATOMIC_ADD(&strm_fe(s)->fe_counters.comp_in, consumed);
+               HA_ATOMIC_ADD(&s->be->be_counters.comp_in, consumed);
                update_freq_ctr(&global.comp_bps_out, to_forward);
                HA_ATOMIC_ADD(&strm_fe(s)->fe_counters.comp_out, to_forward);
                HA_ATOMIC_ADD(&s->be->be_counters.comp_out, to_forward);
+       } else {
+               HA_ATOMIC_ADD(&strm_fe(s)->fe_counters.comp_byp, consumed);
+               HA_ATOMIC_ADD(&s->be->be_counters.comp_byp, consumed);
        }
        return to_forward;