September 2025 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: sgsn: TC_stat_bsc_sctp_disconnected: validate using StatsD

by lynxis lazus

Attention is currently required from: fixeria, osmith, pespin. lynxis lazus has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40992?usp=email ) Change subject: sgsn: TC_stat_bsc_sctp_disconnected: validate using StatsD ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40992?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1ff8c51a73556357c5a5e97bc2a0edec30f1cf03 Gerrit-Change-Number: 40992 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Sep 2025 11:14:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 5 days

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sgsn: Add suport to obtain statsd output

by lynxis lazus

Attention is currently required from: fixeria, osmith, pespin. lynxis lazus has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40991?usp=email ) Change subject: sgsn: Add suport to obtain statsd output ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40991?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic86ce75ea700d05fc65fcea3cdab7b7eaac12069 Gerrit-Change-Number: 40991 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Sep 2025 11:14:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 5 days

1
0
0 0

[M] Change in osmo-sgsn[master]: iu_rnc: Introduce helper API iu_rnc_discard_all_ue_ctx()

by osmith

Attention is currently required from: fixeria, lynxis lazus, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/40987?usp=email ) Change subject: iu_rnc: Introduce helper API iu_rnc_discard_all_ue_ctx() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/40987?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ie3a4732a85a69d115dd5756bfa64b296e9e5edd2 Gerrit-Change-Number: 40987 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 02 Sep 2025 11:10:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 5 days

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sgsn: TC_stat_bsc_sctp_disconnected: validate using StatsD

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40992?usp=email ) Change subject: sgsn: TC_stat_bsc_sctp_disconnected: validate using StatsD ...................................................................... sgsn: TC_stat_bsc_sctp_disconnected: validate using StatsD Similar to what we alreay do in counterpart MSC_Tests_iu.TC_stat_bsc_sctp_disconnected. Related: OS#3403 Depends: osmo-sgsn.git Change-Id I51b5227d92027f1251dc4debbbf59737e7c1a9ba Change-Id: I1ff8c51a73556357c5a5e97bc2a0edec30f1cf03 --- M sgsn/SGSN_Tests.ttcn M sgsn/SGSN_Tests_Iu.ttcn 2 files changed, 32 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/92/40992/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 1b339cf..7364dc4 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -566,6 +566,11 @@ return vc_conn; } +friend function f_sgsn_stats_prefix() return charstring +{ + return mp_statsd_prefix & "sgsn.0."; +} + /* TODO: * Detach without Attach * SM procedures without attach / RAU diff --git a/sgsn/SGSN_Tests_Iu.ttcn b/sgsn/SGSN_Tests_Iu.ttcn index 6e8b5b6..71c20ef 100644 --- a/sgsn/SGSN_Tests_Iu.ttcn +++ b/sgsn/SGSN_Tests_Iu.ttcn @@ -4,6 +4,11 @@ import from Osmocom_VTY_Functions all; import from Misc_Helpers all; +import from StatsD_Types all; +import from StatsD_CodecPort all; +import from StatsD_CodecPort_CtrlFunct all; +import from StatsD_Checker all; + import from SGSN_Tests all; import from BSSGP_Emulation all; @@ -432,12 +437,28 @@ */ testcase TC_stat_rnc_sctp_disconnected() runs on test_CT { var BSSGP_ConnHdlr vc_conn; + var charstring sgsn_stats_prefix := f_sgsn_stats_prefix(); + var StatsDExpects expect_connected := { + {name := sgsn_stats_prefix & "iu_peers.total", mtype := "g", min := 1, max := 1}, + {name := sgsn_stats_prefix & "iu_peers.active", mtype := "g", min := 1, max := 1} + }; + var StatsDExpects expect_disconnected := { + {name := sgsn_stats_prefix & "iu_peers.total", mtype := "g", min := 1, max := 1}, + {name := sgsn_stats_prefix & "iu_peers.active", mtype := "g", min := 0, max := 0} + }; + + g_statd_timeout := 15.0; f_init(); f_init_vty_stp(); f_sleep(1.0); f_vty_config(SGSNVTY, "sgsn", "encryption uea 0"); + connect(self:STATSD_PROC, vc_STATSD:STATSD_PROC); + f_statsd_reset(); + f_statsd_expect(expect_connected, wait_converge := true); + disconnect(self:STATSD_PROC, vc_STATSD:STATSD_PROC); + vc_conn := f_start_handler(refers(f_TC_iu_attach), testcasename(), g_gb, 1008); vc_conn.done; @@ -445,12 +466,16 @@ f_vty_stp_sgsn_asp_cmd("shutdown"); /* Wait for AS PENDING->INACTIVE transition (T(r) timeout after 2000msec): */ - f_sleep(3.0); + connect(self:STATSD_PROC, vc_STATSD:STATSD_PROC); + f_statsd_expect(expect_disconnected, wait_converge := true); + disconnect(self:STATSD_PROC, vc_STATSD:STATSD_PROC); f_logp(SGSNVTY, "Restarting SGSN ASP in STP"); f_vty_stp_sgsn_asp_cmd("no shutdown"); - f_sleep(15.0); + connect(self:STATSD_PROC, vc_STATSD:STATSD_PROC); + f_statsd_expect(expect_connected, wait_converge := true); + disconnect(self:STATSD_PROC, vc_STATSD:STATSD_PROC); vc_conn := f_start_handler(refers(f_TC_iu_attach), testcasename(), g_gb, 1009); vc_conn.done; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40992?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1ff8c51a73556357c5a5e97bc2a0edec30f1cf03 Gerrit-Change-Number: 40992 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 weeks, 5 days

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sgsn: Add suport to obtain statsd output

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40991?usp=email ) Change subject: sgsn: Add suport to obtain statsd output ...................................................................... sgsn: Add suport to obtain statsd output It will be used in a follow-up commit in TC_stat_rnc_sctp_disconnected. This new test infrastructure can still be used with osmo-sgsn latest since it already initialized the statsd VTY commands despite having no osmo_stats in use. Change-Id: Ic86ce75ea700d05fc65fcea3cdab7b7eaac12069 --- M sgsn/README.md M sgsn/SGSN_Tests.cfg M sgsn/SGSN_Tests.default M sgsn/SGSN_Tests.ttcn M sgsn/gen_links.sh M sgsn/osmo-sgsn.cfg M sgsn/regen_makefile.sh 7 files changed, 41 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/91/40991/1 diff --git a/sgsn/README.md b/sgsn/README.md index c6ee447..c161aff 100644 --- a/sgsn/README.md +++ b/sgsn/README.md @@ -6,6 +6,7 @@ * Gp: GTP (emulates GGSN) * GSUP (emulates HLR) * VTY + * StatsD {% dot sgsn_tests.svg digraph G { @@ -20,5 +21,6 @@ ATS -> STP [label="Iu (IuPS)"]; SGSN -> ATS [label="GSUP"]; ATS -> SGSN [label="VTY"]; + SGSN -> ATS [label="StatsD"]; } %} diff --git a/sgsn/SGSN_Tests.cfg b/sgsn/SGSN_Tests.cfg index 365d4cd..edda944 100644 --- a/sgsn/SGSN_Tests.cfg +++ b/sgsn/SGSN_Tests.cfg @@ -10,6 +10,7 @@ [TESTPORT_PARAMETERS] *.SGSNVTY.CTRL_HOSTNAME := "127.0.0.10" +*.STATSVTY.CTRL_HOSTNAME := "127.0.0.10" [MODULE_PARAMETERS] SGSN_Tests.mp_nsconfig := { diff --git a/sgsn/SGSN_Tests.default b/sgsn/SGSN_Tests.default index f8d3e46..5a7b8c6 100644 --- a/sgsn/SGSN_Tests.default +++ b/sgsn/SGSN_Tests.default @@ -17,6 +17,15 @@ *.SGSNVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" *.SGSNVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" *.SGSNVTY.PROMPT1 := "OsmoSGSN> " +*.STATSVTY.CTRL_MODE := "client" +*.STATSVTY.CTRL_HOSTNAME := "127.0.0.1" +*.STATSVTY.CTRL_PORTNUM := "4245" +*.STATSVTY.CTRL_LOGIN_SKIPPED := "yes" +*.STATSVTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes" +*.STATSVTY.CTRL_READMODE := "buffered" +*.STATSVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" +*.STATSVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" +*.STATSVTY.PROMPT1 := "OsmoSGSN> " *.STPVTY.CTRL_MODE := "client" *.STPVTY.CTRL_HOSTNAME := "127.0.0.1" *.STPVTY.CTRL_PORTNUM := "4239" diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 3e5ed5b..1b339cf 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -26,6 +26,11 @@ import from Osmocom_Gb_Types all; import from SCCPasp_Types all; +import from StatsD_Types all; +import from StatsD_CodecPort all; +import from StatsD_CodecPort_CtrlFunct all; +import from StatsD_Checker all; + import from MobileL3_CommonIE_Types all; import from MobileL3_GMM_SM_Types all; import from MobileL3_Types all; @@ -72,6 +77,12 @@ integer mp_echo_interval := 5; /* in seconds. Only used in test enabling g_use_echo */ charstring mp_sgsn_gtp_ip := "127.0.0.10"; + /* Address where we listen for STATSD metrics */ + charstring mp_local_statsd_ip := "127.0.0.1"; + /* port number to which to listen for STATSD metrics */ + integer mp_msc_statsd_port := 8125; + charstring mp_statsd_prefix := "TTCN3."; + NSConfigurations mp_nsconfig := { { nsei := 96, @@ -174,7 +185,7 @@ type record length(NUM_RNC) of IuInstance IuInstances; type record of RAN_Configuration RAN_Configurations; -type component test_CT extends GTP_ConnHdlr { +type component test_CT extends GTP_ConnHdlr, StatsD_ConnHdlr { var GbInstances g_gb; var IuInstances g_iu; var boolean g_iu_enable := false; @@ -196,6 +207,10 @@ port TELNETasp_PT SGSNVTY; port TELNETasp_PT STPVTY; + /* StatsD */ + var StatsD_Checker_CT vc_STATSD; + var float g_statd_timeout := 5.0; + var boolean g_initialized := false; var boolean g_use_echo := false; }; @@ -437,6 +452,7 @@ } f_init_gsup("SGSN_Test"); f_init_ggsn_gtp("SGSN_Test"); + f_init_statsd("SGSN_Test", vc_STATSD, mp_local_statsd_ip, mp_msc_statsd_port, g_statd_timeout); f_vty_enable_echo_interval(g_use_echo); } diff --git a/sgsn/gen_links.sh b/sgsn/gen_links.sh index fe1bf08..e991fd5 100755 --- a/sgsn/gen_links.sh +++ b/sgsn/gen_links.sh @@ -88,6 +88,7 @@ FILES+="BSSGP_Emulation.ttcnpp Osmocom_Gb_Types.ttcn " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " FILES+="Osmocom_VTY_Functions.ttcn " +FILES+="StatsD_Types.ttcn StatsD_CodecPort.ttcn StatsD_CodecPort_CtrlFunct.ttcn StatsD_CodecPort_CtrlFunctdef.cc StatsD_Checker.ttcnpp " FILES+="LLC_Templates.ttcn L3_Templates.ttcn L3_Common.ttcn " FILES+="ITU_X213_Types.ttcn " FILES+="RAN_Emulation.ttcnpp RAN_Adapter.ttcnpp SCCP_Templates.ttcn " diff --git a/sgsn/osmo-sgsn.cfg b/sgsn/osmo-sgsn.cfg index ae01923..e9f56c0 100644 --- a/sgsn/osmo-sgsn.cfg +++ b/sgsn/osmo-sgsn.cfg @@ -46,7 +46,15 @@ logging level lm3ua notice logging level lmgcp notice ! -stats interval 5 +stats interval 0 +stats reporter statsd + prefix TTCN3 + level subscriber + remote-ip 127.0.0.1 + remote-port 8125 + flush-period 1 + mtu 1024 + enable ! line vty no login diff --git a/sgsn/regen_makefile.sh b/sgsn/regen_makefile.sh index c116d94..7034243 100755 --- a/sgsn/regen_makefile.sh +++ b/sgsn/regen_makefile.sh @@ -19,6 +19,7 @@ RANAP_EncDec.cc SCCP_EncDec.cc SCTPasp_PT.cc + StatsD_CodecPort_CtrlFunctdef.cc TCCConversion.cc TCCInterface.cc TELNETasp_PT.cc @@ -30,6 +31,7 @@ -DIPA_EMULATION_GSUP -DRAN_EMULATION_RANAP -DUSE_MTP3_DISTRIBUTOR + -DSTATSD_HAVE_VTY " . ../_buildsystem/regen_makefile.inc.sh -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40991?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic86ce75ea700d05fc65fcea3cdab7b7eaac12069 Gerrit-Change-Number: 40991 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 weeks, 5 days

1
0
0 0

[XL] Change in libosmo-netif[master]: doc: add twrtp guide document

by pespin

Attention is currently required from: falconia, fixeria, jolly, laforge. pespin has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/libosmo-netif/+/39291?usp=email ) Change subject: doc: add twrtp guide document ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/39291?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I90976edfd8c66c2d1c5bc7939e0a49f725a02f3f Gerrit-Change-Number: 39291 Gerrit-PatchSet: 3 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Sep 2025 10:50:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 5 days

1
0
0 0

[M] Change in osmo-sgsn[master]: stats: Introduce stats sgsn.iu_peers.{total,active}

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/40990?usp=email ) Change subject: stats: Introduce stats sgsn.iu_peers.{total,active} ...................................................................... stats: Introduce stats sgsn.iu_peers.{total,active} Change-Id: I51b5227d92027f1251dc4debbbf59737e7c1a9ba --- M include/osmocom/sgsn/sgsn.h M src/sgsn/iu_rnc.c M src/sgsn/iu_rnc_fsm.c M src/sgsn/sgsn.c 4 files changed, 53 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/90/40990/1 diff --git a/include/osmocom/sgsn/sgsn.h b/include/osmocom/sgsn/sgsn.h index 8fc97b0..8524dd7 100644 --- a/include/osmocom/sgsn/sgsn.h +++ b/include/osmocom/sgsn/sgsn.h @@ -5,6 +5,7 @@ #include <osmocom/core/msgb.h> #include <osmocom/core/select.h> +#include <osmocom/core/stat_item.h> #include <osmocom/crypt/gprs_cipher.h> #include <osmocom/gprs/gprs_ns2.h> #include <osmocom/gprs/gprs_bssgp.h> @@ -159,6 +160,7 @@ struct sgsn_ra_global *routing_area; struct rate_ctr_group *rate_ctrs; + struct osmo_stat_item_group *statg; struct llist_head apn_list; /* list of struct sgsn_apn_ctx */ struct llist_head ggsn_list; /* list of struct sgsn_ggsn_ctx */ @@ -184,6 +186,21 @@ extern struct sgsn_instance *sgsn; extern void *tall_sgsn_ctx; +enum { + SGSN_STAT_IU_PEERS_TOTAL, + SGSN_STAT_IU_PEERS_ACTIVE, +}; +static inline void sgsn_stat_inc(unsigned int idx, int32_t value) +{ + osmo_stat_item_inc(osmo_stat_item_group_get_item(sgsn->statg, idx), value); +} + +static inline void sgsn_stat_dec(unsigned int idx, int32_t value) +{ + osmo_stat_item_dec(osmo_stat_item_group_get_item(sgsn->statg, idx), value); +} + + /* * ctrl interface related work (sgsn_ctrl.c) */ diff --git a/src/sgsn/iu_rnc.c b/src/sgsn/iu_rnc.c index abe6f61..38cddb5 100644 --- a/src/sgsn/iu_rnc.c +++ b/src/sgsn/iu_rnc.c @@ -76,6 +76,7 @@ osmo_rnc_id_name(rnc_id), addr_str); llist_add(&rnc->entry, &sgsn->rnc_list); + sgsn_stat_inc(SGSN_STAT_IU_PEERS_TOTAL, 1); LOGP(DRANAP, LOGL_NOTICE, "New RNC %s at %s\n", osmo_rnc_id_name(&rnc->rnc_id), osmo_sccp_addr_dump(rnc_sccp_addr)); diff --git a/src/sgsn/iu_rnc_fsm.c b/src/sgsn/iu_rnc_fsm.c index 4085586..6f610b4 100644 --- a/src/sgsn/iu_rnc_fsm.c +++ b/src/sgsn/iu_rnc_fsm.c @@ -216,6 +216,12 @@ } } +static void iu_rnc_st_ready_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + if (prev_state != IU_RNC_ST_READY) + sgsn_stat_inc(SGSN_STAT_IU_PEERS_ACTIVE, 1); +} + static void iu_rnc_st_ready(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct ranap_iu_rnc *rnc = fi->priv; @@ -261,6 +267,12 @@ } } +static void iu_rnc_st_ready_onleave(struct osmo_fsm_inst *fi, uint32_t next_state) +{ + if (next_state != IU_RNC_ST_READY) + sgsn_stat_dec(SGSN_STAT_IU_PEERS_ACTIVE, 1); +} + static int iu_rnc_fsm_timer_cb(struct osmo_fsm_inst *fi) { struct ranap_iu_rnc *rnc = fi->priv; @@ -273,6 +285,10 @@ struct ranap_iu_rnc *rnc = fi->priv; iu_rnc_discard_all_ue_ctx(rnc); + + if (rnc->fi->state == IU_RNC_ST_READY) + sgsn_stat_dec(SGSN_STAT_IU_PEERS_ACTIVE, 1); + sgsn_stat_dec(SGSN_STAT_IU_PEERS_TOTAL, 1); } static const struct osmo_fsm_state iu_rnc_fsm_states[] = { @@ -314,6 +330,8 @@ [IU_RNC_ST_READY] = { .name = "READY", .action = iu_rnc_st_ready, + .onenter = iu_rnc_st_ready_onenter, + .onleave = iu_rnc_st_ready_onleave, .in_event_mask = 0 | S(IU_RNC_EV_RX_RESET) | S(IU_RNC_EV_MSG_UP_CO_INITIAL) diff --git a/src/sgsn/sgsn.c b/src/sgsn/sgsn.c index 1b02f76..fe52e6c 100644 --- a/src/sgsn/sgsn.c +++ b/src/sgsn/sgsn.c @@ -103,6 +103,20 @@ sgsn_ctr_description, }; + +static const struct osmo_stat_item_desc sgsn_stat_item_description[] = { + [SGSN_STAT_IU_PEERS_TOTAL] = { "iu_peers:total", "Total Iu peers (RNC, HNBGW) seen since startup", OSMO_STAT_ITEM_NO_UNIT, 4, 0}, + [SGSN_STAT_IU_PEERS_ACTIVE] = { "iu_peers:active", "Currently active Iu peers (RANAP ready)", OSMO_STAT_ITEM_NO_UNIT, 4, 0}, +}; + +static const struct osmo_stat_item_group_desc sgsn_statg_desc = { + "sgsn", + "serving GPRS support node statistics", + OSMO_STATS_CLASS_GLOBAL, + ARRAY_SIZE(sgsn_stat_item_description), + sgsn_stat_item_description, +}; + static void sgsn_llme_cleanup_free(struct gprs_llc_llme *llme) { struct sgsn_mm_ctx *mmctx = NULL; @@ -161,6 +175,7 @@ #endif /* #if BUILD_IU */ osmo_timer_del(&sgi->llme_timer); rate_ctr_group_free(sgi->rate_ctrs); + osmo_stat_item_group_free(sgi->statg); return 0; } @@ -185,6 +200,8 @@ inst->rate_ctrs = rate_ctr_group_alloc(inst, &sgsn_ctrg_desc, 0); OSMO_ASSERT(inst->rate_ctrs); + inst->statg = osmo_stat_item_group_alloc(inst, &sgsn_statg_desc, 0); + OSMO_ASSERT(inst->statg); INIT_LLIST_HEAD(&inst->apn_list); INIT_LLIST_HEAD(&inst->ggsn_list); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/40990?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I51b5227d92027f1251dc4debbbf59737e7c1a9ba Gerrit-Change-Number: 40990 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 weeks, 5 days

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: testenv: don't use all RAM in 5gc testsuite build

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40968?usp=email ) Change subject: testenv: don't use all RAM in 5gc testsuite build ...................................................................... testenv: don't use all RAM in 5gc testsuite build When building the 5gc testsuite with as many parallel jobs as CPU cores are available (the default), on at least Pau's and my system, all RAM gets consumed and the system becomes unusable. On other systems, an out-of-memory killer might kill the compiler, which is also not great. This can currently only be avoided if the user remembers to pass "-j4" to testenv, to ensure that only 4 jobs run in parallel. Add a new max_jobs_per_gb_ram= option to 5gc/testenv.cfg. Set it to 0.3, so on e.g. systems with 15 GiB of RAM, we get 4 jobs as maximum. Change-Id: I1b9c9a2e3fa244337342e95457ac6d3a8caa0ae6 --- M 5gc/testenv.cfg M _testenv/README.md M _testenv/testenv/__init__.py M _testenv/testenv/testenv_cfg.py M _testenv/testenv/testsuite.py 5 files changed, 71 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/5gc/testenv.cfg b/5gc/testenv.cfg index d70c135..876aacf 100644 --- a/5gc/testenv.cfg +++ b/5gc/testenv.cfg @@ -1,5 +1,6 @@ [testsuite] titan_min=11.1.0 +max_jobs_per_gb_ram=0.3 program=C5G_Tests config=C5G_Tests.cfg copy=testsuite_prepare.sh diff --git a/_testenv/README.md b/_testenv/README.md index ecc8701..072dcd2 100644 --- a/_testenv/README.md +++ b/_testenv/README.md @@ -89,6 +89,11 @@ depending on when the script runs. The script will not run on crash if podman is used, as the container gets shutdown beforehand. +* `max_jobs_per_gb_ram=`: optional value that can be set to reduce the amount + of parallel jobs when compiling the testsuite. This is set in the 5gc + testsuite to avoid consuming the whole RAM and freezing (or possibly getting + killed from an out-of-memory daemon). + #### Component section * `program=`: executable for starting a test component, may contain arguments. diff --git a/_testenv/testenv/__init__.py b/_testenv/testenv/__init__.py index 44e0e92..c9e63b4 100644 --- a/_testenv/testenv/__init__.py +++ b/_testenv/testenv/__init__.py @@ -125,6 +125,7 @@ "--jobs", help="number of jobs to run simultaneously (default: nproc)", type=int, + default=os.cpu_count(), ) group.add_argument( "-a", diff --git a/_testenv/testenv/testenv_cfg.py b/_testenv/testenv/testenv_cfg.py index c687d88..9edc102 100644 --- a/_testenv/testenv/testenv_cfg.py +++ b/_testenv/testenv/testenv_cfg.py @@ -5,9 +5,11 @@ import fnmatch import glob import logging +import math import os.path import sys import testenv +import traceback cfgs = {} current = None @@ -147,6 +149,64 @@ return get_titan_version(cfg) +def verify_max_jobs_per_gb_ram(cfgs_all): + error = False + max_jobs_per_gb_ram = None + + for cfg_name, cfg in cfgs_all.items(): + cfg_max = cfg["testsuite"].get("max_jobs_per_gb_ram", None) + if cfg_max is not None: + if max_jobs_per_gb_ram is not None: + if cfg_max != max_jobs_per_gb_ram: + error = True + break + else: + max_jobs_per_gb_ram = cfg_max + elif max_jobs_per_gb_ram: + error = True + break + + if not error: + return + + logging.error("Found different max_jobs_per_gb_ram= values in testenv.cfg files of the same directory.") + logging.error("This is not supported, please fix it.") + sys.exit(1) + + +def get_titan_make_job_count(): + _, cfg = next(iter(cfgs.items())) + max_jobs_per_gb_ram = cfg["testsuite"].get("max_jobs_per_gb_ram", None) + max_jobs = None + + if max_jobs_per_gb_ram: + try: + gb_ram = 0 + with open("/proc/meminfo") as f: + line = f.readline() + # Parse e.g. "MemTotal: 15571604 kB" + if line.startswith("MemTotal:"): + gb_ram = int(line.split(" ")[-2]) / 1024 / 1024 + logging.debug(f"Building with {round(gb_ram, 2)} GB of RAM") + max_jobs = math.floor(gb_ram * float(max_jobs_per_gb_ram)) + if max_jobs < 1: + raise RuntimeError(f"max_jobs is invalid: max_jobs={max_jobs}, gb_ram={gb_ram}") + + except Exception as ex: + traceback.print_exception(type(ex), ex, ex.__traceback__) + logging.error(f"Calculating max jobs with max_jobs_per_gb_ram={max_jobs_per_gb_ram} failed, assuming 4") + max_jobs = 4 + + if max_jobs and max_jobs < testenv.args.jobs: + logging.info( + f"Using only {max_jobs} jobs instead of {testenv.args.jobs} because of" + f" max_jobs_per_gb_ram={max_jobs_per_gb_ram} in testenv.cfg" + ) + return max_jobs + + return testenv.args.jobs + + def verify_qemu_cfgs(): """Check if passed -C or -K args make sense with the testenv configs.""" testsuite = testenv.args.testsuite @@ -194,6 +254,7 @@ "prepare", "program", "titan_min", + "max_jobs_per_gb_ram", ] keys_valid_component = [ "clean", @@ -346,6 +407,8 @@ cfgs_all[basename] = cfg + verify_max_jobs_per_gb_ram(cfgs_all) + # Select configs based on --config argument(s) for config_arg in testenv.args.config: if config_arg == "all": diff --git a/_testenv/testenv/testsuite.py b/_testenv/testenv/testsuite.py index 0e00b0f..0007c57 100644 --- a/_testenv/testenv/testsuite.py +++ b/_testenv/testenv/testsuite.py @@ -58,8 +58,7 @@ logging.info(f"Building testsuite (eclipse-titan {titan_version}, {titan_reason})") env = copy.copy(builddir_env) - if testenv.args.jobs: - env["PARALLEL_MAKE"] = f"-j{testenv.args.jobs}" + env["PARALLEL_MAKE"] = f"-j{testenv.testenv_cfg.get_titan_make_job_count()}" testenv.cmd.run(["make", testenv.args.testsuite], cwd=testenv.ttcn3_hacks_dir, env=env) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40968?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1b9c9a2e3fa244337342e95457ac6d3a8caa0ae6 Gerrit-Change-Number: 40968 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 weeks, 5 days

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: testenv: don't use all RAM in 5gc testsuite build

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40968?usp=email ) Change subject: testenv: don't use all RAM in 5gc testsuite build ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40968?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1b9c9a2e3fa244337342e95457ac6d3a8caa0ae6 Gerrit-Change-Number: 40968 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Sep 2025 08:59:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 5 days

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: es12_Types_JSON: add ES12 JSON encoder/decoder

by laforge

Attention is currently required from: Hoernchen, dexter. laforge has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40981?usp=email ) Change subject: es12_Types_JSON: add ES12 JSON encoder/decoder ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40981?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I875cbb3a6dab6ac1eac5df1199f6fb71738a744e Gerrit-Change-Number: 40981 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Sep 2025 08:28:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 5 days

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2025