<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18875">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">MSC pooling: add rate counters<br><br>Tests for these counters are added in I2006f1def5352b4b73d0159bfcaa2da9c64bfe3f<br>(osmo-ttcn3-hacks).<br><br>Change-Id: I2ded757958dfa62b502efbab765203bcadf899e2<br>---<br>M include/osmocom/bsc/bsc_msc_data.h<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/gsm_08_08.c<br>M src/osmo-bsc/osmo_bsc_msc.c<br>4 files changed, 67 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/75/18875/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h</span><br><span>index f19b9a0..b1fe14d 100644</span><br><span>--- a/include/osmocom/bsc/bsc_msc_data.h</span><br><span>+++ b/include/osmocom/bsc/bsc_msc_data.h</span><br><span>@@ -96,6 +96,13 @@</span><br><span> MSC_CTR_BSSMAP_TX_DT1_HANDOVER_COMPLETE,</span><br><span> MSC_CTR_BSSMAP_TX_DT1_HANDOVER_FAILURE,</span><br><span> MSC_CTR_BSSMAP_TX_DT1_DTAP,</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_MSCPOOL_SUBSCR_NEW,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_MSCPOOL_SUBSCR_REATTACH,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_MSCPOOL_SUBSCR_KNOWN,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_MSCPOOL_SUBSCR_PAGED,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_MSCPOOL_SUBSCR_ATTACH_LOST,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_MSCPOOL_EMERG_FORWARDED,</span><br><span> };</span><br><span> </span><br><span> /* Constants for the MSC stats */</span><br><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index 38047d2..9874706 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -1558,6 +1558,9 @@</span><br><span> BSC_CTR_PAGING_RESPONDED,</span><br><span> BSC_CTR_PAGING_NO_ACTIVE_PAGING,</span><br><span> BSC_CTR_UNKNOWN_UNIT_ID,</span><br><span style="color: hsl(120, 100%, 40%);">+ BSC_CTR_MSCPOOL_SUBSCR_NO_MSC,</span><br><span style="color: hsl(120, 100%, 40%);">+ BSC_CTR_MSCPOOL_EMERG_FORWARDED,</span><br><span style="color: hsl(120, 100%, 40%);">+ BSC_CTR_MSCPOOL_EMERG_LOST,</span><br><span> };</span><br><span> </span><br><span> static const struct rate_ctr_desc bsc_ctr_description[] = {</span><br><span>@@ -1604,6 +1607,13 @@</span><br><span> [BSC_CTR_PAGING_NO_ACTIVE_PAGING] = {"paging:no_active_paging", "Paging response without an active paging request (arrived after paging expiration?)."},</span><br><span> </span><br><span> [BSC_CTR_UNKNOWN_UNIT_ID] = {"abis:unknown_unit_id", "Connection attempts from unknown IPA CCM Unit ID."},</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ [BSC_CTR_MSCPOOL_SUBSCR_NO_MSC] = {"mscpool:subscr:no_msc",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Complete Layer 3 requests lost because no connected MSC is found available."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [BSC_CTR_MSCPOOL_EMERG_FORWARDED] = {"mscpool:emerg:forwarded",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Emergency call requests forwarded to an MSC (see also per-MSC counters)"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [BSC_CTR_MSCPOOL_EMERG_LOST] = {"mscpool:emerg:lost",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Emergency call requests lost because no MSC was found available."},</span><br><span> };</span><br><span> </span><br><span> </span><br><span>diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c</span><br><span>index 32363eb..3703c76 100644</span><br><span>--- a/src/osmo-bsc/gsm_08_08.c</span><br><span>+++ b/src/osmo-bsc/gsm_08_08.c</span><br><span>@@ -228,6 +228,7 @@</span><br><span> if (is_msc_usable(msc_target, is_emerg)) {</span><br><span> LOG_COMPL_L3(pdisc, mtype, LOGL_DEBUG, "%s matches earlier Paging from msc %d\n",</span><br><span> osmo_mobile_identity_to_str_c(OTC_SELECT, &mi), msc_target->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&msc_target->msc_ctrs->ctr[MSC_CTR_MSCPOOL_SUBSCR_PAGED]);</span><br><span> return msc_target;</span><br><span> } else {</span><br><span> LOG_COMPL_L3(pdisc, mtype, LOGL_DEBUG,</span><br><span>@@ -268,9 +269,11 @@</span><br><span> bool nri_matches_msc = (nri_v >= 0 && osmo_nri_v_matches_ranges(nri_v, msc->nri_ranges));</span><br><span> </span><br><span> if (!is_msc_usable(msc, is_emerg)) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (nri_matches_msc)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nri_matches_msc) {</span><br><span> LOG_NRI(LOGL_DEBUG, "matches msc %d, but this MSC is currently not connected\n",</span><br><span> msc->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&msc->msc_ctrs->ctr[MSC_CTR_MSCPOOL_SUBSCR_ATTACH_LOST]);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> continue;</span><br><span> }</span><br><span> </span><br><span>@@ -281,6 +284,11 @@</span><br><span> msc->nr);</span><br><span> } else {</span><br><span> LOG_NRI(LOGL_DEBUG, "matches msc %d\n", msc->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&msc->msc_ctrs->ctr[MSC_CTR_MSCPOOL_SUBSCR_KNOWN]);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (is_emerg) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&msc->msc_ctrs->ctr[MSC_CTR_MSCPOOL_EMERG_FORWARDED]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bsc_gsmnet->bsc_ctrs->ctr[BSC_CTR_MSCPOOL_EMERG_FORWARDED]);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> return msc;</span><br><span> }</span><br><span> }</span><br><span>@@ -316,12 +324,25 @@</span><br><span> if (!msc_target) {</span><br><span> LOG_COMPL_L3(pdisc, mtype, LOGL_ERROR, "%s%s: No suitable MSC for this Complete Layer 3 request found\n",</span><br><span> osmo_mobile_identity_to_str_c(OTC_SELECT, &mi), is_emerg ? " FOR EMERGENCY CALL" : "");</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bsc_gsmnet->bsc_ctrs->ctr[BSC_CTR_MSCPOOL_SUBSCR_NO_MSC]);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (is_emerg)</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bsc_gsmnet->bsc_ctrs->ctr[BSC_CTR_MSCPOOL_EMERG_LOST]);</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span> LOGP(DMSC, LOGL_DEBUG, "New subscriber %s: MSC round-robin selects msc %d\n",</span><br><span> osmo_mobile_identity_to_str_c(OTC_SELECT, &mi), msc_target->nr);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (is_null_nri)</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&msc_target->msc_ctrs->ctr[MSC_CTR_MSCPOOL_SUBSCR_REATTACH]);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&msc_target->msc_ctrs->ctr[MSC_CTR_MSCPOOL_SUBSCR_NEW]);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (is_emerg) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&msc_target->msc_ctrs->ctr[MSC_CTR_MSCPOOL_EMERG_FORWARDED]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bsc_gsmnet->bsc_ctrs->ctr[BSC_CTR_MSCPOOL_EMERG_FORWARDED]);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* An MSC was picked by round-robin, so update the next round-robin nr to pick */</span><br><span> if (is_emerg)</span><br><span> net->mscs_round_robin_next_emerg_nr = msc_target->nr + 1;</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c</span><br><span>index 157808e..9b00ffc 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_msc.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_msc.c</span><br><span>@@ -100,6 +100,34 @@</span><br><span> [MSC_CTR_BSSMAP_TX_DT1_HANDOVER_COMPLETE] = {"bssmap:tx:dt1:handover:complete", "Number of transmitted BSSMAP DT1 HANDOVER COMPLETE messages"},</span><br><span> [MSC_CTR_BSSMAP_TX_DT1_HANDOVER_FAILURE] = {"bssmap:tx:dt1:handover:failure", "Number of transmitted BSSMAP DT1 HANDOVER FAILURE messages"},</span><br><span> [MSC_CTR_BSSMAP_TX_DT1_DTAP] = {"bssmap:tx:dt1:dtap", "Number of transmitted BSSMAP DT1 DTAP messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Indicators for MSC pool usage */</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_MSCPOOL_SUBSCR_NEW] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ "mscpool:subscr:new",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Complete Layer 3 requests assigned to this MSC by round-robin (no NRI was assigned yet).",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_MSCPOOL_SUBSCR_REATTACH] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ "mscpool:subscr:reattach",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Complete Layer 3 requests assigned to this MSC by round-robin because the subscriber indicates a"</span><br><span style="color: hsl(120, 100%, 40%);">+ " NULL-NRI (previously assigned by another MSC).",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_MSCPOOL_SUBSCR_KNOWN] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ "mscpool:subscr:known",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Complete Layer 3 requests directed to this MSC because the subscriber indicates an NRI of this MSC.",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_MSCPOOL_SUBSCR_PAGED] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ "mscpool:subscr:paged",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Paging Response directed to this MSC because the subscriber was recently paged by this MSC.",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_MSCPOOL_SUBSCR_ATTACH_LOST] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ "mscpool:subscr:attach_lost",</span><br><span style="color: hsl(120, 100%, 40%);">+ "A subscriber indicates an NRI value matching this MSC, but the MSC is not connected:"</span><br><span style="color: hsl(120, 100%, 40%);">+ " a re-attach to another MSC (if available) was forced, with possible service failure.",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_MSCPOOL_EMERG_FORWARDED] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ "mscpool:emerg:forwarded",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Emergency call requests forwarded to this MSC.",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> };</span><br><span> </span><br><span> static const struct rate_ctr_group_desc msc_ctrg_desc = {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18875">change 18875</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bsc/+/18875"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I2ded757958dfa62b502efbab765203bcadf899e2 </div>
<div style="display:none"> Gerrit-Change-Number: 18875 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>