ipse has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/18050
)
Change subject: counters: Implement more useful counters.
......................................................................
counters: Implement more useful counters.
Right now a lot of errors with MGCP processing are invisible in rate
counters which makes them difficult to trace or even notice in
a production environment. E.g. reaching a limit of MGCP endpoints
is completely invisible even though it's a critical opertion alarm.
Change-Id: I6db68f044255c927dfd534fed880e405ec3ed4d6
---
M include/osmocom/mgcp/mgcp.h
M src/libosmo-mgcp/mgcp_protocol.c
M src/libosmo-mgcp/mgcp_vty.c
3 files changed, 59 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h
index a479fbb..43f480e 100644
--- a/include/osmocom/mgcp/mgcp.h
+++ b/include/osmocom/mgcp/mgcp.h
@@ -119,6 +119,16 @@
#define MGCP_KEEPALIVE_ONCE (-1)
#define MGCP_KEEPALIVE_NEVER 0
+/* Global MCGP general rate counters */
+enum {
+ MGCP_GENERAL_RX_MSGS_TOTAL,
+ MGCP_GENERAL_RX_MSGS_RETRANSMITTED,
+ MGCP_GENERAL_RX_MSGS_HANDLED,
+ MGCP_GENERAL_RX_MSGS_UNHANDLED,
+ MGCP_GENERAL_RX_FAIL_MSG_PARSE,
+ MGCP_GENERAL_RX_FAIL_NO_ENDPOINT,
+};
+
/* Global MCGP CRCX related rate counters */
enum {
MGCP_CRCX_SUCCESS,
@@ -207,6 +217,8 @@
int vty_number_endpoints;
struct mgcp_endpoint *endpoints;
+ /* Rate counter group which contains stats for generic MGCP events. */
+ struct rate_ctr_group *mgcp_general_ctr_group;
/* Rate counter group which contains stats for processed CRCX commands.
*/
struct rate_ctr_group *mgcp_crcx_ctr_group;
/* Rate counter group which contains stats for processed MDCX commands.
*/
diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c
index 12fea1d..82c10aa 100644
--- a/src/libosmo-mgcp/mgcp_protocol.c
+++ b/src/libosmo-mgcp/mgcp_protocol.c
@@ -53,6 +53,24 @@
#define MGCP_REQUEST(NAME, REQ, DEBUG_NAME) \
{ .name = NAME, .handle_request = REQ, .debug_name = DEBUG_NAME },
+static const struct rate_ctr_desc mgcp_general_ctr_desc[] = {
+ /* rx_msgs = rx_msgs_retransmitted + rx_msgs_handled +
rx_msgs_unhandled + err_rx_msg_parse + err_rx_no_endpoint */
+ [MGCP_GENERAL_RX_MSGS_TOTAL] = {"mgcp:rx_msgs", "total number of MGCP
messages received."},
+ [MGCP_GENERAL_RX_MSGS_RETRANSMITTED] = {"mgcp:rx_msgs_retransmitted",
"number of received retransmissions."},
+ [MGCP_GENERAL_RX_MSGS_HANDLED] = {"mgcp:rx_msgs_handled", "number of
handled MGCP messages."},
+ [MGCP_GENERAL_RX_MSGS_UNHANDLED] = {"mgcp:rx_msgs_unhandled", "number
of unhandled MGCP messages."},
+ [MGCP_GENERAL_RX_FAIL_MSG_PARSE] = {"mgcp:err_rx_msg_parse", "error
parsing MGCP message."},
+ [MGCP_GENERAL_RX_FAIL_NO_ENDPOINT] = {"mgcp:err_rx_no_endpoint", "can't
find MGCP endpoint, probably we've used all allocated endpoints."},
+};
+
+const static struct rate_ctr_group_desc mgcp_general_ctr_group_desc = {
+ .group_name_prefix = "mgcp",
+ .group_description = "mgcp general statistics",
+ .class_id = OSMO_STATS_CLASS_GLOBAL,
+ .num_ctr = ARRAY_SIZE(mgcp_general_ctr_desc),
+ .ctr_desc = mgcp_general_ctr_desc
+};
+
static const struct rate_ctr_desc mgcp_crcx_ctr_desc[] = {
[MGCP_CRCX_SUCCESS] = {"crcx:success", "CRCX command processed
successfully."},
[MGCP_CRCX_FAIL_BAD_ACTION] = {"crcx:bad_action", "bad action in CRCX
command."},
@@ -361,24 +379,33 @@
* - or a response (three numbers, space, transaction id) */
struct msgb *mgcp_handle_message(struct mgcp_config *cfg, struct msgb *msg)
{
+ struct mgcp_trunk_config *tcfg = &cfg->trunk;
+ struct rate_ctr_group *rate_ctrs = tcfg->mgcp_general_ctr_group;
struct mgcp_parse_data pdata;
int rc, i, code, handled = 0;
struct msgb *resp = NULL;
char *data;
+ /* Count all messages, even incorect ones */
+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_GENERAL_RX_MSGS_TOTAL]);
+
if (msgb_l2len(msg) < 4) {
LOGP(DLMGCP, LOGL_ERROR, "msg too short: %d\n", msg->len);
+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_GENERAL_RX_FAIL_MSG_PARSE]);
return NULL;
}
- if (mgcp_msg_terminate_nul(msg))
+ if (mgcp_msg_terminate_nul(msg)) {
+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_GENERAL_RX_FAIL_MSG_PARSE]);
return NULL;
+ }
mgcp_disp_msg(msg->l2h, msgb_l2len(msg), "Received message");
/* attempt to treat it as a response */
if (sscanf((const char *)&msg->l2h[0], "%3d %*s", &code) == 1) {
LOGP(DLMGCP, LOGL_DEBUG, "Response: Code: %d\n", code);
+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_GENERAL_RX_FAIL_MSG_PARSE]);
return NULL;
}
@@ -394,12 +421,14 @@
if (pdata.endp && pdata.trans
&& pdata.endp->last_trans
&& strcmp(pdata.endp->last_trans, pdata.trans) == 0) {
+
rate_ctr_inc(&rate_ctrs->ctr[MGCP_GENERAL_RX_MSGS_RETRANSMITTED]);
return do_retransmission(pdata.endp);
}
/* check for general parser failure */
if (rc < 0) {
LOGP(DLMGCP, LOGL_NOTICE, "%s: failed to find the endpoint\n",
msg->l2h);
+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_GENERAL_RX_FAIL_NO_ENDPOINT]);
return create_err_response(NULL, -rc, (const char *) msg->l2h,
pdata.trans);
}
@@ -413,9 +442,13 @@
}
}
- if (!handled)
+ if (handled) {
+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_GENERAL_RX_MSGS_HANDLED]);
+ } else {
+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_GENERAL_RX_MSGS_UNHANDLED]);
LOGP(DLMGCP, LOGL_NOTICE, "MSG with type: '%.4s' not handled\n",
&msg->l2h[0]);
+ }
return resp;
}
@@ -1556,11 +1589,19 @@
/* FIXME: Each new rate counter group requires a unique index. At the
* moment we generate an index using a counter, but perhaps there is
* a better way of assigning indices? */
+ static unsigned int general_rate_ctr_index = 0;
static unsigned int crcx_rate_ctr_index = 0;
static unsigned int mdcx_rate_ctr_index = 0;
static unsigned int dlcx_rate_ctr_index = 0;
static unsigned int all_rtp_conn_rate_ctr_index = 0;
+ if (trunk->mgcp_general_ctr_group == NULL) {
+ trunk->mgcp_general_ctr_group = rate_ctr_group_alloc(ctx,
&mgcp_general_ctr_group_desc, general_rate_ctr_index);
+ if (!trunk->mgcp_general_ctr_group)
+ return -1;
+ talloc_set_destructor(trunk->mgcp_general_ctr_group,
free_rate_counter_group);
+ general_rate_ctr_index++;
+ }
if (trunk->mgcp_crcx_ctr_group == NULL) {
trunk->mgcp_crcx_ctr_group = rate_ctr_group_alloc(ctx,
&mgcp_crcx_ctr_group_desc, crcx_rate_ctr_index);
if (!trunk->mgcp_crcx_ctr_group)
diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c
index fa175e1..76d674f 100644
--- a/src/libosmo-mgcp/mgcp_vty.c
+++ b/src/libosmo-mgcp/mgcp_vty.c
@@ -266,6 +266,10 @@
vty_out(vty, "%s", VTY_NEWLINE);
vty_out(vty, "Rate counters:%s", VTY_NEWLINE);
}
+ if (show_stats && cfg->mgcp_general_ctr_group) {
+ vty_out(vty, " %s:%s",
cfg->mgcp_general_ctr_group->desc->group_description, VTY_NEWLINE);
+ vty_out_rate_ctr_group_fmt(vty, " %25n: %10c (%S/s %M/m %H/h
%D/d) %d", cfg->mgcp_general_ctr_group);
+ }
if (show_stats && cfg->mgcp_crcx_ctr_group) {
vty_out(vty, " %s:%s",
cfg->mgcp_crcx_ctr_group->desc->group_description, VTY_NEWLINE);
vty_out_rate_ctr_group_fmt(vty, " %25n: %10c (%S/s %M/m %H/h
%D/d) %d", cfg->mgcp_crcx_ctr_group);
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18050
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I6db68f044255c927dfd534fed880e405ec3ed4d6
Gerrit-Change-Number: 18050
Gerrit-PatchSet: 5
Gerrit-Owner: ipse <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: ipse <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged
