<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18471">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
srs_andre: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ms_srs: wait 6s after stopping srsUE<br><br>we've only waited when running with ZMQ but in fact we need<br>to always wait because the UE may need some time to<br>gracefully exit, i.e. send the detach request and shut down correctly.<br><br>this is checked in cleanup() and verity_metrics(), so also before copying back<br>the CSV metrics. But we only wait once.<br><br>Change-Id: I47e46b8ccce41c9a62d2d6866260d22c927e710d<br>---<br>M src/osmo_gsm_tester/obj/ms_srs.py<br>1 file changed, 20 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/obj/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>index a8e86d3..389ed6b 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>@@ -96,6 +96,7 @@</span><br><span> self.remote_log_file = None</span><br><span> self.remote_pcap_file = None</span><br><span> self.remote_metrics_file = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.stop_sleep_time = 6 # We require at most 5s to stop</span><br><span> self.enable_pcap = False</span><br><span> self.num_carriers = 1</span><br><span> self.testenv = testenv</span><br><span>@@ -109,12 +110,10 @@</span><br><span> return</span><br><span> if self.setup_runs_locally():</span><br><span> return</span><br><span style="color: hsl(0, 100%, 40%);">- # When using zmq, srsUE is known to hang for a few seconds before</span><br><span style="color: hsl(0, 100%, 40%);">- # exiting (3 seconds after alarm() watchdog kicks in). We hence need to</span><br><span style="color: hsl(0, 100%, 40%);">- # wait to make sure the remote process terminated and the file was</span><br><span style="color: hsl(0, 100%, 40%);">- # flushed, since cleanup() triggered means only the local ssh client was killed.</span><br><span style="color: hsl(0, 100%, 40%);">- if self._conf and self._conf.get('rf_dev_type', '') == 'zmq':</span><br><span style="color: hsl(0, 100%, 40%);">- MainLoop.sleep(self, 3)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Make sure we give the UE time to tear down</span><br><span style="color: hsl(120, 100%, 40%);">+ self.sleep_after_stop()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # copy back files (may not exist, for instance if there was an early error of process):</span><br><span> try:</span><br><span> self.rem_host.scpfrom('scp-back-log', self.remote_log_file, self.log_file)</span><br><span>@@ -132,8 +131,15 @@</span><br><span> def netns(self):</span><br><span> return "srsue1"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def sleep_after_stop(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ # Only sleep once</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.stop_sleep_time > 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ MainLoop.sleep(self, self.stop_sleep_time)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.stop_sleep_time = 0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def stop(self):</span><br><span> self.testenv.stop_process(self.process)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.sleep_after_stop()</span><br><span> </span><br><span> def connect(self, enb):</span><br><span> self.log('Starting srsue')</span><br><span>@@ -341,15 +347,14 @@</span><br><span> # file is not properly flushed until the process has stopped.</span><br><span> if self.running():</span><br><span> self.stop()</span><br><span style="color: hsl(0, 100%, 40%);">- # metrics file is not flushed immediatelly by the OS during process</span><br><span style="color: hsl(0, 100%, 40%);">- # tear down, we need to wait some extra time:</span><br><span style="color: hsl(0, 100%, 40%);">- MainLoop.sleep(self, 2)</span><br><span style="color: hsl(0, 100%, 40%);">- if not self.setup_runs_locally():</span><br><span style="color: hsl(0, 100%, 40%);">- try:</span><br><span style="color: hsl(0, 100%, 40%);">- self.rem_host.scpfrom('scp-back-metrics', self.remote_metrics_file, self.metrics_file)</span><br><span style="color: hsl(0, 100%, 40%);">- except Exception as e:</span><br><span style="color: hsl(0, 100%, 40%);">- self.err('Failed copying back metrics file from remote host')</span><br><span style="color: hsl(0, 100%, 40%);">- raise e</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if not self.setup_runs_locally():</span><br><span style="color: hsl(120, 100%, 40%);">+ try:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rem_host.scpfrom('scp-back-metrics', self.remote_metrics_file, self.metrics_file)</span><br><span style="color: hsl(120, 100%, 40%);">+ except Exception as e:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.err('Failed copying back metrics file from remote host')</span><br><span style="color: hsl(120, 100%, 40%);">+ raise e</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> metrics = srsUEMetrics(self.metrics_file)</span><br><span> return metrics.verify(value, operation, metric, criterion, window)</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18471">change 18471</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-gsm-tester/+/18471"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I47e46b8ccce41c9a62d2d6866260d22c927e710d </div>
<div style="display:none"> Gerrit-Change-Number: 18471 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: srs_andre <andre@softwareradiosystems.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: srs_andre <andre@softwareradiosystems.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>