MINOR: mux-h2: count open connections/streams on stats
Implement as a gauge h2 counters for currently open connections and
streams. The counters are decremented when closing the stream or the
connection.
diff --git a/src/mux_h2.c b/src/mux_h2.c
index 0b2be7a..9df21e5 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -391,6 +391,9 @@
H2_ST_RST_STREAM_RESP,
H2_ST_GOAWAY_RESP,
+ H2_ST_OPEN_CONN,
+ H2_ST_OPEN_STREAM,
+
H2_STATS_COUNT /* must be the last member of the enum */
};
@@ -414,6 +417,11 @@
.desc = "Total number of rst_stream sent on detected error" },
[H2_ST_GOAWAY_RESP] = { .name = "h2_goaway_resp",
.desc = "Total number of goaway sent on detected error" },
+
+ [H2_ST_OPEN_CONN] = { .name = "h2_open_connections",
+ .desc = "Count of currently open connections" },
+ [H2_ST_OPEN_STREAM] = { .name = "h2_backend_open_streams",
+ .desc = "Count of currently open streams" },
};
static struct h2_counters {
@@ -427,6 +435,9 @@
long long strm_proto_err; /* total number of protocol errors detected */
long long rst_stream_resp; /* total number of rst_stream frame sent on error */
long long goaway_resp; /* total number of goaway frame sent on error */
+
+ long long open_conns; /* count of currently open connections */
+ long long open_streams; /* count of currently open streams */
} h2_counters;
static void h2_fill_stats(void *data, struct field *stats)
@@ -443,6 +454,9 @@
stats[H2_ST_STRM_PROTO_ERR] = mkf_u64(FN_COUNTER, counters->strm_proto_err);
stats[H2_ST_RST_STREAM_RESP] = mkf_u64(FN_COUNTER, counters->rst_stream_resp);
stats[H2_ST_GOAWAY_RESP] = mkf_u64(FN_COUNTER, counters->goaway_resp);
+
+ stats[H2_ST_OPEN_CONN] = mkf_u64(FN_GAUGE, counters->open_conns);
+ stats[H2_ST_OPEN_STREAM] = mkf_u64(FN_GAUGE, counters->open_streams);
}
static struct stats_module h2_stats_module = {
@@ -974,6 +988,8 @@
goto fail_stream;
}
+ HA_ATOMIC_ADD(&h2c->px_counters->open_conns, 1);
+
/* prepare to read something */
h2c_restart_reading(h2c, 1);
TRACE_LEAVE(H2_EV_H2C_NEW, conn);
@@ -1055,6 +1071,8 @@
conn->xprt->unsubscribe(conn, conn->xprt_ctx, h2c->wait_event.events,
&h2c->wait_event);
+ HA_ATOMIC_SUB(&h2c->px_counters->open_conns, 1);
+
pool_free(pool_head_h2c, h2c);
}
@@ -1333,6 +1351,8 @@
if (!(h2s->cs->flags & CS_FL_EOS) && !b_data(&h2s->rxbuf))
h2s_notify_recv(h2s);
}
+ HA_ATOMIC_SUB(&h2s->h2c->px_counters->open_streams, 1);
+
TRACE_LEAVE(H2_EV_H2S_END, h2s->h2c->conn, h2s);
}
h2s->st = H2_SS_CLOSED;
@@ -1427,6 +1447,8 @@
h2c->nb_streams++;
h2c->stream_cnt++;
+ HA_ATOMIC_ADD(&h2c->px_counters->open_streams, 1);
+
TRACE_LEAVE(H2_EV_H2S_NEW, h2c->conn, h2s);
return h2s;
out: