<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24937">View Change</a></p><div style="white-space:pre-wrap">Approvals:
neels: Looks good to me, approved
daniel: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">hodec2: add low-rxqual-assignment penalty timer (2/2)<br><br>Hold off re-assignment after an intra-cell re-assignment due to low<br>rxqual.<br><br>Adjust test_amr_tch_h_to_f_rxqual.ho_vty to show the changed behaviour.<br><br>Related: SYS#5198<br>Change-Id: Id00a07313fe04eec509b336c0637b59c707760e0<br>---<br>M include/osmocom/bsc/handover_cfg.h<br>M src/osmo-bsc/handover_decision_2.c<br>M tests/handover/test_amr_tch_h_to_f_rxqual.ho_vty<br>M tests/handover_cfg.vty<br>4 files changed, 39 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/handover_cfg.h b/include/osmocom/bsc/handover_cfg.h</span><br><span>index 551ce8d..2bd2681 100644</span><br><span>--- a/include/osmocom/bsc/handover_cfg.h</span><br><span>+++ b/include/osmocom/bsc/handover_cfg.h</span><br><span>@@ -261,6 +261,13 @@</span><br><span> " see also 'handover2 retries'\n" \</span><br><span> "Seconds\n") \</span><br><span> \</span><br><span style="color: hsl(120, 100%, 40%);">+ HO_CFG_ONE_MEMBER(int, hodec2_penalty_low_rxqual_as, 60, \</span><br><span style="color: hsl(120, 100%, 40%);">+ "handover2 ", "penalty-time low-rxqual-assignment", "<0-99999>", atoi, "%d", as_is, \</span><br><span style="color: hsl(120, 100%, 40%);">+ HO_CFG_STR_HANDOVER2 \</span><br><span style="color: hsl(120, 100%, 40%);">+ HO_CFG_STR_PENALTY_TIME \</span><br><span style="color: hsl(120, 100%, 40%);">+ "Time to suspend re-assignment after an lchan was re-assigned because of low RxQual\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "Seconds\n") \</span><br><span style="color: hsl(120, 100%, 40%);">+ \</span><br><span> HO_CFG_ONE_MEMBER(int, hodec2_retries, 0, \</span><br><span> "handover2 ", "retries", "<0-9>", atoi, "%d", as_is, \</span><br><span> HO_CFG_STR_HANDOVER2 \</span><br><span>diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c</span><br><span>index af36c31..d08173c 100644</span><br><span>--- a/src/osmo-bsc/handover_decision_2.c</span><br><span>+++ b/src/osmo-bsc/handover_decision_2.c</span><br><span>@@ -1410,10 +1410,21 @@</span><br><span> </span><br><span> /* perform handover, if there is a candidate */</span><br><span> if (best_cand) {</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span> LOGPHOCAND(best_cand, LOGL_INFO, "Best candidate: RX level %d%s\n",</span><br><span> rxlev2dbm(best_cand->target.rxlev),</span><br><span> best_applied_afs_bias ? " (applied AHS -> AFS rxlev bias)" : "");</span><br><span style="color: hsl(0, 100%, 40%);">- return trigger_ho(best_cand, best_cand->requirements & REQUIREMENT_A_MASK);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = trigger_ho(best_cand, best_cand->requirements & REQUIREMENT_A_MASK);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* After upgrading TCH/H to TCH/F due to bad RxQual, start penalty timer to avoid re-assignment within</span><br><span style="color: hsl(120, 100%, 40%);">+ * the same cell again, to avoid oscillation from RxQual noise combined with congestion resolution. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!rc && is_upgrade_to_tchf(best_cand, REQUIREMENT_A_MASK)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm0808_cell_id bts_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_bts_cell_id(&bts_id, best_cand->target.bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ penalty_timers_add(lchan->conn, &lchan->conn->hodec2.penalty_timers, &bts_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ ho_get_hodec2_penalty_low_rxqual_as(bts->ho));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span> }</span><br><span> </span><br><span> /* Damn, all is congested, has too low RXLEV or cannot service the voice call due to codec</span><br><span>diff --git a/tests/handover/test_amr_tch_h_to_f_rxqual.ho_vty b/tests/handover/test_amr_tch_h_to_f_rxqual.ho_vty</span><br><span>index 32a95e1..f3a2a90 100644</span><br><span>--- a/tests/handover/test_amr_tch_h_to_f_rxqual.ho_vty</span><br><span>+++ b/tests/handover/test_amr_tch_h_to_f_rxqual.ho_vty</span><br><span>@@ -25,15 +25,12 @@</span><br><span> </span><br><span> # The penalty timer is still active, no re-assignment from congestion of TCH/H</span><br><span> congestion-check</span><br><span style="color: hsl(0, 100%, 40%);">-# "FAIL": the penalty timer is not yet implemented</span><br><span style="color: hsl(0, 100%, 40%);">-#expect-no-chan</span><br><span style="color: hsl(0, 100%, 40%);">-#expect-ts-use trx 0 0 states * TCH/F - - - - - *</span><br><span style="color: hsl(0, 100%, 40%);">-expect-as from lchan 0 0 1 0 to lchan 0 0 4 0</span><br><span style="color: hsl(0, 100%, 40%);">-expect-ts-use trx 0 0 states * - - - TCH/H- - - *</span><br><span style="color: hsl(120, 100%, 40%);">+expect-no-chan</span><br><span style="color: hsl(120, 100%, 40%);">+expect-ts-use trx 0 0 states * TCH/F - - - - - *</span><br><span> </span><br><span> # But handover to another cell is not held off</span><br><span> create-bts trx-count 1 timeslots c+s4 TCH/F TCH/F TCH/F TCH/H TCH/H TCH/H PDCH</span><br><span style="color: hsl(0, 100%, 40%);">-set-ts-use trx 0 0 states * TCH/F - - - - - *</span><br><span style="color: hsl(120, 100%, 40%);">+expect-ts-use trx 0 0 states * TCH/F - - - - - *</span><br><span> expect-ts-use trx 1 0 states * - - - - - - *</span><br><span> </span><br><span> meas-rep lchan 0 0 1 0 rxlev 30 rxqual 5 ta 0 neighbors 35</span><br><span>diff --git a/tests/handover_cfg.vty b/tests/handover_cfg.vty</span><br><span>index ccb1a6b..eb3ec3e 100644</span><br><span>--- a/tests/handover_cfg.vty</span><br><span>+++ b/tests/handover_cfg.vty</span><br><span>@@ -189,6 +189,7 @@</span><br><span> handover2 penalty-time max-distance (<0-99999>|default)</span><br><span> handover2 penalty-time failed-ho (<0-99999>|default)</span><br><span> handover2 penalty-time failed-assignment (<0-99999>|default)</span><br><span style="color: hsl(120, 100%, 40%);">+ handover2 penalty-time low-rxqual-assignment (<0-99999>|default)</span><br><span> handover2 retries (<0-9>|default)</span><br><span> handover2 congestion-check (disabled|<1-999>|now)</span><br><span> ...</span><br><span>@@ -384,9 +385,10 @@</span><br><span> default Use default (9999), remove explicit setting on this node</span><br><span> </span><br><span> OsmoBSC(config-net)# handover2 penalty-time ?</span><br><span style="color: hsl(0, 100%, 40%);">- max-distance Time to suspend handover for a subscriber after leaving this cell due to exceeding max distance; see also 'handover2 retries'</span><br><span style="color: hsl(0, 100%, 40%);">- failed-ho Time to suspend handover for a subscriber after a failed handover into this cell; see also 'handover2 retries'</span><br><span style="color: hsl(0, 100%, 40%);">- failed-assignment Time to suspend handover for a subscriber after a failed re-assignment within this cell; see also 'handover2 retries'</span><br><span style="color: hsl(120, 100%, 40%);">+ max-distance Time to suspend handover for a subscriber after leaving this cell due to exceeding max distance; see also 'handover2 retries'</span><br><span style="color: hsl(120, 100%, 40%);">+ failed-ho Time to suspend handover for a subscriber after a failed handover into this cell; see also 'handover2 retries'</span><br><span style="color: hsl(120, 100%, 40%);">+ failed-assignment Time to suspend handover for a subscriber after a failed re-assignment within this cell; see also 'handover2 retries'</span><br><span style="color: hsl(120, 100%, 40%);">+ low-rxqual-assignment Time to suspend re-assignment after an lchan was re-assigned because of low RxQual</span><br><span> </span><br><span> OsmoBSC(config-net)# handover2 penalty-time max-distance ?</span><br><span> <0-99999> Seconds</span><br><span>@@ -400,6 +402,10 @@</span><br><span> <0-99999> Seconds</span><br><span> default Use default (60), remove explicit setting on this node</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net)# handover2 penalty-time low-rxqual-assignment ?</span><br><span style="color: hsl(120, 100%, 40%);">+ <0-99999> Seconds</span><br><span style="color: hsl(120, 100%, 40%);">+ default Use default (60), remove explicit setting on this node</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> OsmoBSC(config-net)# handover2 retries ?</span><br><span> <0-9> Number of retries</span><br><span> default Use default (0), remove explicit setting on this node</span><br><span>@@ -603,9 +609,10 @@</span><br><span> default Use default (9999), remove explicit setting on this node</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# handover2 penalty-time ?</span><br><span style="color: hsl(0, 100%, 40%);">- max-distance Time to suspend handover for a subscriber after leaving this cell due to exceeding max distance; see also 'handover2 retries'</span><br><span style="color: hsl(0, 100%, 40%);">- failed-ho Time to suspend handover for a subscriber after a failed handover into this cell; see also 'handover2 retries'</span><br><span style="color: hsl(0, 100%, 40%);">- failed-assignment Time to suspend handover for a subscriber after a failed re-assignment within this cell; see also 'handover2 retries'</span><br><span style="color: hsl(120, 100%, 40%);">+ max-distance Time to suspend handover for a subscriber after leaving this cell due to exceeding max distance; see also 'handover2 retries'</span><br><span style="color: hsl(120, 100%, 40%);">+ failed-ho Time to suspend handover for a subscriber after a failed handover into this cell; see also 'handover2 retries'</span><br><span style="color: hsl(120, 100%, 40%);">+ failed-assignment Time to suspend handover for a subscriber after a failed re-assignment within this cell; see also 'handover2 retries'</span><br><span style="color: hsl(120, 100%, 40%);">+ low-rxqual-assignment Time to suspend re-assignment after an lchan was re-assigned because of low RxQual</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# handover2 penalty-time max-distance ?</span><br><span> <0-99999> Seconds</span><br><span>@@ -619,6 +626,10 @@</span><br><span> <0-99999> Seconds</span><br><span> default Use default (60), remove explicit setting on this node</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# handover2 penalty-time low-rxqual-assignment ?</span><br><span style="color: hsl(120, 100%, 40%);">+ <0-99999> Seconds</span><br><span style="color: hsl(120, 100%, 40%);">+ default Use default (60), remove explicit setting on this node</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> OsmoBSC(config-net-bts)# handover2 retries ?</span><br><span> <0-9> Number of retries</span><br><span> default Use default (0), remove explicit setting on this node</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24937">change 24937</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/+/24937"/><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: Id00a07313fe04eec509b336c0637b59c707760e0 </div>
<div style="display:none"> Gerrit-Change-Number: 24937 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>