<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25646">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Delay abis reconnect while bts is shutting down<br><br>Avoid re-connecting to a new BSC while BTS is in shutting down. All the<br>FSMs are complex enough to even try to re-start when stopping has not<br>yet finished...<br><br>Change-Id: I1727828a16f4ec8043b00cc6b2e02a4c35f71377<br>---<br>M include/osmo-bts/bts_shutdown_fsm.h<br>M src/common/abis.c<br>M src/common/bts_shutdown_fsm.c<br>3 files changed, 17 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/46/25646/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/bts_shutdown_fsm.h b/include/osmo-bts/bts_shutdown_fsm.h</span><br><span>index 1e74ac6..76ac6ca 100644</span><br><span>--- a/include/osmo-bts/bts_shutdown_fsm.h</span><br><span>+++ b/include/osmo-bts/bts_shutdown_fsm.h</span><br><span>@@ -39,3 +39,6 @@</span><br><span> };</span><br><span> </span><br><span> extern struct osmo_fsm bts_shutdown_fsm;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct gsm_bts;</span><br><span style="color: hsl(120, 100%, 40%);">+bool bts_shutdown_in_progress(const struct gsm_bts *bts);</span><br><span>diff --git a/src/common/abis.c b/src/common/abis.c</span><br><span>index 11111fa..f1fb10c 100644</span><br><span>--- a/src/common/abis.c</span><br><span>+++ b/src/common/abis.c</span><br><span>@@ -53,6 +53,7 @@</span><br><span> #include <osmo-bts/abis_osmo.h></span><br><span> #include <osmo-bts/bts_model.h></span><br><span> #include <osmo-bts/bts_trx.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmo-bts/bts_shutdown_fsm.h></span><br><span> </span><br><span> static struct gsm_bts *g_bts;</span><br><span> </span><br><span>@@ -137,6 +138,12 @@</span><br><span>        struct abis_link_fsm_priv *priv = fi->priv;</span><br><span>       struct gsm_bts *bts = priv->bts;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+       if (bts_shutdown_in_progress(bts)) {</span><br><span style="color: hsl(120, 100%, 40%);">+          LOGPFSML(fi, LOGL_NOTICE, "BTS is shutting down, delaying A-bis connection establishment to BSC\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                osmo_fsm_inst_state_chg(fi, ABIS_LINK_ST_WAIT_RECONNECT, OML_RETRY_TIMER, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+         return;</span><br><span style="color: hsl(120, 100%, 40%);">+       }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  if (pick_next_bsc(fi) < 0) {</span><br><span>              LOGPFSML(fi, LOGL_FATAL, "No BSC available, A-bis connection establishment failed\n");</span><br><span>             osmo_fsm_inst_state_chg(fi, ABIS_LINK_ST_FAILED, 0, 0);</span><br><span>diff --git a/src/common/bts_shutdown_fsm.c b/src/common/bts_shutdown_fsm.c</span><br><span>index 85d2d83..600407a 100644</span><br><span>--- a/src/common/bts_shutdown_fsm.c</span><br><span>+++ b/src/common/bts_shutdown_fsm.c</span><br><span>@@ -237,10 +237,16 @@</span><br><span>     OSMO_ASSERT(osmo_fsm_register(&bts_shutdown_fsm) == 0);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+bool bts_shutdown_in_progress(const struct gsm_bts *bts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+     struct osmo_fsm_inst *fi = bts->shutdown_fi;</span><br><span style="color: hsl(120, 100%, 40%);">+       return fi->state != BTS_SHUTDOWN_ST_NONE;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void bts_shutdown_ext(struct gsm_bts *bts, const char *reason, bool exit_proc)</span><br><span> {</span><br><span>     struct osmo_fsm_inst *fi = bts->shutdown_fi;</span><br><span style="color: hsl(0, 100%, 40%);">- if (fi->state != BTS_SHUTDOWN_ST_NONE) {</span><br><span style="color: hsl(120, 100%, 40%);">+   if (bts_shutdown_in_progress(bts)) {</span><br><span>                 LOGPFSML(fi, LOGL_NOTICE, "BTS is already being shutdown.\n");</span><br><span>             if (exit_proc)</span><br><span>                       bts->shutdown_fi_exit_proc = true;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25646">change 25646</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-bts/+/25646"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I1727828a16f4ec8043b00cc6b2e02a4c35f71377 </div>
<div style="display:none"> Gerrit-Change-Number: 25646 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>