Change in osmo-hnbgw[master]: Introduce support for libosmo-mgcp-client MGW pooling

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/29806 ) Change subject: Introduce support for libosmo-mgcp-client MGW pooling ...................................................................... Introduce support for libosmo-mgcp-client MGW pooling Large RAN installations may benefit from distributing the RTP voice stream load over multiple media gateways. libosmo-mgcp-client supports MGW pooling since version 1.8.0 (more than one year ago). OsmoBSC has already been making use of it since then (see osmo-bsc.git 8d22e6870637ed6d392a8a77aeaebc51b23a8a50); lets use this feature in osmo-hngw too. This commit is also part of a series of patches cleaning up libosmo-mgcp-client and slowly getting rid of the old non-mgw-pooled VTY configuration, in order to keep only 1 way to configure libosmo-mgcp-client through VTY. Related: SYS#5091 Related: SYS#5987 Change-Id: I371dc773b58788ee21037dc25d77f556c89c6b61 --- M doc/examples/osmo-hnbgw/osmo-hnbgw-pfcp.cfg M doc/examples/osmo-hnbgw/osmo-hnbgw.cfg M doc/manuals/chapters/running.adoc M include/osmocom/hnbgw/hnbgw.h M include/osmocom/hnbgw/vty.h M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/hnbgw_vty.c M src/osmo-hnbgw/mgw_fsm.c M tests/ranap_rab_ass/Makefile.am 9 files changed, 82 insertions(+), 37 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/examples/osmo-hnbgw/osmo-hnbgw-pfcp.cfg b/doc/examples/osmo-hnbgw/osmo-hnbgw-pfcp.cfg index 619b29b..cc853d5 100644 --- a/doc/examples/osmo-hnbgw/osmo-hnbgw-pfcp.cfg +++ b/doc/examples/osmo-hnbgw/osmo-hnbgw-pfcp.cfg @@ -11,11 +11,11 @@ iuh local-ip 0.0.0.0 hnbap-allow-tmsi 1 - mgcp - mgw remote-ip 127.0.0.1 - mgw local-port 2729 - mgw remote-port 2427 - mgw reset-endpoint rtpbridge/* + mgw 0 + remote-ip 127.0.0.1 + local-port 2729 + remote-port 2427 + reset-endpoint rtpbridge/* pfcp remote-addr 127.0.0.2 local-addr 127.0.0.1 diff --git a/doc/examples/osmo-hnbgw/osmo-hnbgw.cfg b/doc/examples/osmo-hnbgw/osmo-hnbgw.cfg index b7f41e1..82731a8 100644 --- a/doc/examples/osmo-hnbgw/osmo-hnbgw.cfg +++ b/doc/examples/osmo-hnbgw/osmo-hnbgw.cfg @@ -11,9 +11,9 @@ iuh local-ip 0.0.0.0 hnbap-allow-tmsi 1 - mgcp - mgw remote-ip 127.0.0.1 - mgw local-port 2729 - mgw remote-port 2427 - mgw reset-endpoint rtpbridge/* + mgw 0 + remote-ip 127.0.0.1 + local-port 2729 + remote-port 2427 + reset-endpoint rtpbridge/* diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index e575215..ee4b832 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -136,10 +136,10 @@ ---- hnbgw - mgcp - mgw remote-ip 127.0.0.1 - mgw remote-port 2427 - mgw reset-endpoint rtpbridge/* + mgw 0 + remote-ip 127.0.0.1 + remote-port 2427 + reset-endpoint rtpbridge/* ---- ==== Configure co-located User Plane Function diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h index 778fa45..8adefea 100644 --- a/include/osmocom/hnbgw/hnbgw.h +++ b/include/osmocom/hnbgw/hnbgw.h @@ -10,6 +10,8 @@ #define DEBUG #include <osmocom/core/logging.h> +#include <osmocom/mgcp_client/mgcp_client.h> +#include <osmocom/mgcp_client/mgcp_client_pool.h> enum { DMAIN, @@ -160,7 +162,9 @@ struct osmo_sccp_addr iucs_remote_addr; struct osmo_sccp_addr iups_remote_addr; } sccp; - struct mgcp_client *mgcp_client; + /* MGW pool, also includes the single MGCP client as fallback if no + * pool is configured. */ + struct mgcp_client_pool *mgw_pool; struct { struct osmo_pfcp_endpoint *ep; diff --git a/include/osmocom/hnbgw/vty.h b/include/osmocom/hnbgw/vty.h index e97a1ad..cf4a1eb 100644 --- a/include/osmocom/hnbgw/vty.h +++ b/include/osmocom/hnbgw/vty.h @@ -8,6 +8,7 @@ IUCS_NODE, IUPS_NODE, MGCP_NODE, + MGW_NODE, PFCP_NODE, }; diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index ce5e5e4..2836ae1 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -104,6 +104,7 @@ context_map_init(gw); + gw->mgw_pool = mgcp_client_pool_alloc(gw); gw->config.mgcp_client = talloc_zero(tall_hnb_ctx, struct mgcp_client_conf); mgcp_client_conf_init(gw->config.mgcp_client); @@ -673,6 +674,41 @@ return 1; } +static int hnbgw_mgw_setup(void) +{ + struct mgcp_client *mgcp_client_single; + unsigned int pool_members_initalized; + + /* Initialize MGW pool. This initalizes and connects all MGCP clients that are currently configured in + * the pool. Adding additional MGCP clients to the pool is possible but the user has to configure and + * (re)connect them manually from the VTY. */ + pool_members_initalized = mgcp_client_pool_connect(g_hnb_gw->mgw_pool); + if (pool_members_initalized) { + LOGP(DMGW, LOGL_NOTICE, + "MGW pool with %u pool members configured, (ignoring MGW configuration in VTY node 'mgcp').\n", + pool_members_initalized); + return 0; + } + + /* Initialize and connect a single MGCP client. This MGCP client will appear as the one and only pool + * member if there is no MGW pool configured. */ + LOGP(DMGW, LOGL_NOTICE, "No MGW pool configured, using MGW configuration in VTY node 'mgcp'\n"); + mgcp_client_single = mgcp_client_init(tall_hnb_ctx, g_hnb_gw->config.mgcp_client); + if (!mgcp_client_single) { + LOGP(DMGW, LOGL_ERROR, "MGW (single) client initalization failed\n"); + return -EINVAL; + } + if (mgcp_client_connect(mgcp_client_single)) { + LOGP(DMGW, LOGL_ERROR, "MGW (single) connect failed at (%s:%u)\n", + g_hnb_gw->config.mgcp_client->remote_addr, + g_hnb_gw->config.mgcp_client->remote_port); + return -EINVAL; + } + mgcp_client_pool_register_single(g_hnb_gw->mgw_pool, mgcp_client_single); + + return 0; +} + int main(int argc, char **argv) { struct osmo_stream_srv_link *srv; @@ -784,17 +820,8 @@ g_hnb_gw->iuh = srv; /* Initialize and connect MGCP client. */ - g_hnb_gw->mgcp_client = mgcp_client_init(tall_hnb_ctx, g_hnb_gw->config.mgcp_client); - if (!g_hnb_gw->mgcp_client) { - LOGP(DMGW, LOGL_ERROR, "MGW client initalization failed\n"); + if (hnbgw_mgw_setup() != 0) return -EINVAL; - } - if (mgcp_client_connect(g_hnb_gw->mgcp_client)) { - LOGP(DMGW, LOGL_ERROR, "MGW connect failed at (%s:%u)\n", - g_hnb_gw->config.mgcp_client->remote_addr, - g_hnb_gw->config.mgcp_client->remote_port); - return -EINVAL; - } #if ENABLE_PFCP /* If UPF is configured, set up PFCP socket and send Association Setup Request to UPF */ diff --git a/src/osmo-hnbgw/hnbgw_vty.c b/src/osmo-hnbgw/hnbgw_vty.c index 3f76c6f..2228260 100644 --- a/src/osmo-hnbgw/hnbgw_vty.c +++ b/src/osmo-hnbgw/hnbgw_vty.c @@ -464,14 +464,6 @@ return CMD_SUCCESS; } -static int config_write_hnbgw_mgcp(struct vty *vty) -{ - vty_out(vty, " mgcp%s", VTY_NEWLINE); - mgcp_client_config_write(vty, " "); - - return CMD_SUCCESS; -} - #if ENABLE_PFCP static int config_write_hnbgw_pfcp(struct vty *vty) { @@ -521,7 +513,11 @@ install_element_ve(&show_talloc_cmd); install_element(HNBGW_NODE, &cfg_hnbgw_mgcp_cmd); - install_node(&mgcp_node, config_write_hnbgw_mgcp); + /* Deprecated: Old MGCP config without pooling support in MSC node: */ + install_node(&mgcp_node, NULL); + mgcp_client_vty_init(tall_hnb_ctx, MGCP_NODE, g_hnb_gw->config.mgcp_client); + + mgcp_client_pool_vty_init(HNBGW_NODE, MGW_NODE, " ", g_hnb_gw->mgw_pool); #if ENABLE_PFCP install_node(&pfcp_node, config_write_hnbgw_pfcp); @@ -531,6 +527,5 @@ install_element(PFCP_NODE, &cfg_pfcp_remote_addr_cmd); #endif - mgcp_client_vty_init(tall_hnb_ctx, MGCP_NODE, g_hnb_gw->config.mgcp_client); osmo_tdef_vty_groups_init(HNBGW_NODE, hnbgw_tdef_group); } diff --git a/src/osmo-hnbgw/mgw_fsm.c b/src/osmo-hnbgw/mgw_fsm.c index 8e42f58..b58d01f 100644 --- a/src/osmo-hnbgw/mgw_fsm.c +++ b/src/osmo-hnbgw/mgw_fsm.c @@ -141,6 +141,7 @@ RANAP_RAB_AssignmentRequestIEs_t *ies; const char *epname; struct mgcp_conn_peer mgw_info; + struct mgcp_client *mgcp_client; int rc; LOGPFSML(fi, LOGL_DEBUG, "RAB-AssignmentRequest received, creating HNB side call-leg on MGW...\n"); @@ -172,9 +173,16 @@ mgw_info.codecs[0] = CODEC_IUFP; mgw_info.codecs_len = 1; - epname = mgcp_client_rtpbridge_wildcard(map->hnb_ctx->gw->mgcp_client); + mgcp_client = mgcp_client_pool_get(map->hnb_ctx->gw->mgw_pool); + if (!mgcp_client) { + LOGPFSML(fi, LOGL_ERROR, + "cannot ensure MGW endpoint -- no MGW configured, check configuration!\n"); + osmo_fsm_inst_state_chg(fi, MGW_ST_FAILURE, 0, 0); + return; + } + epname = mgcp_client_rtpbridge_wildcard(mgcp_client); mgw_fsm_priv->mgcpc_ep = - osmo_mgcpc_ep_alloc(fi, MGW_EV_MGCP_TERM, map->hnb_ctx->gw->mgcp_client, mgw_fsm_T_defs, fi->id, "%s", epname); + osmo_mgcpc_ep_alloc(fi, MGW_EV_MGCP_TERM, mgcp_client, mgw_fsm_T_defs, fi->id, "%s", epname); mgw_fsm_priv->mgcpc_ep_ci_hnb = osmo_mgcpc_ep_ci_add(mgw_fsm_priv->mgcpc_ep, "to-HNB"); osmo_mgcpc_ep_ci_request(mgw_fsm_priv->mgcpc_ep_ci_hnb, MGCP_VERB_CRCX, &mgw_info, fi, MGW_EV_MGCP_OK, @@ -488,9 +496,13 @@ static void mgw_fsm_allstate_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct mgw_fsm_priv *mgw_fsm_priv = fi->priv; + struct mgcp_client *mgcp_client; switch (event) { case MGW_EV_MGCP_TERM: + /* Put MGCP client back into MGW pool */ + mgcp_client = osmo_mgcpc_ep_client(mgw_fsm_priv->mgcpc_ep); + mgcp_client_pool_put(mgcp_client); mgw_fsm_priv->mgcpc_ep = NULL; LOGPFSML(fi, LOGL_ERROR, "Media gateway failed\n"); osmo_fsm_inst_state_chg(fi, MGW_ST_FAILURE, 0, 0); @@ -547,6 +559,10 @@ struct hnbgw_context_map *map = mgw_fsm_priv->map; if (mgw_fsm_priv->mgcpc_ep) { + /* Put MGCP client back into MGW pool */ + struct mgcp_client *mgcp_client = osmo_mgcpc_ep_client(mgw_fsm_priv->mgcpc_ep); + mgcp_client_pool_put(mgcp_client); + osmo_mgcpc_ep_clear(mgw_fsm_priv->mgcpc_ep); mgw_fsm_priv->mgcpc_ep = NULL; } diff --git a/tests/ranap_rab_ass/Makefile.am b/tests/ranap_rab_ass/Makefile.am index 70ca6f6..cdda8e3 100644 --- a/tests/ranap_rab_ass/Makefile.am +++ b/tests/ranap_rab_ass/Makefile.am @@ -11,6 +11,7 @@ $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMORANAP_CFLAGS) \ $(LIBOSMOSIGTRAN_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(NULL) @@ -32,6 +33,7 @@ $(LIBOSMOVTY_LIBS) \ $(LIBOSMORANAP_LIBS) \ $(LIBOSMOSIGTRAN_LIBS) \ + $(LIBOSMOMGCPCLIENT_LIBS) \ $(COVERAGE_LDFLAGS) \ $(top_builddir)/src/osmo-hnbgw/ranap_rab_ass.o \ $(NULL) -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I371dc773b58788ee21037dc25d77f556c89c6b61 Gerrit-Change-Number: 29806 Gerrit-PatchSet: 3 Gerrit-Owner: pespin &lt;pespin(a)sysmocom.de&gt; Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel &lt;dwillmann(a)sysmocom.de&gt; Gerrit-Reviewer: dexter &lt;pmaier(a)sysmocom.de&gt; Gerrit-Reviewer: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-Reviewer: osmith &lt;osmith(a)sysmocom.de&gt; Gerrit-Reviewer: pespin &lt;pespin(a)sysmocom.de&gt; Gerrit-CC: laforge &lt;laforge(a)osmocom.org&gt; Gerrit-MessageType: merged