<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18453">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">enb_srs: Use RemoteProcessSafeExit instead of RemoteProcess<br><br>It is known that sometimes srsENB hangs until it is killed -9, specially<br>when using ZMQ backend. Let's use RemoteProcessSafeExit in order to make<br>sure it is killed in an acceptable time (srs binaries use some<br>preventive sigalarm 6 seconds auto-kill procedure, hence we use 7<br>seconds) before next test is started and potentially try to re-use the<br>same ENB and fails due to previous one still running.<br><br>Change-Id: I905bd753c7822feccf1c1bb59752698f1d1b85f0<br>---<br>M src/osmo_gsm_tester/obj/enb_srs.py<br>1 file changed, 10 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/obj/enb_srs.py b/src/osmo_gsm_tester/obj/enb_srs.py</span><br><span>index 4311d60..47b373e 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/enb_srs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/enb_srs.py</span><br><span>@@ -59,6 +59,7 @@</span><br><span> self.pcap_file = None</span><br><span> self.process = None</span><br><span> self.rem_host = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_run_dir = None</span><br><span> self.remote_config_file = None</span><br><span> self.remote_config_sib_file = None</span><br><span> self.remote_config_rr_file = None</span><br><span>@@ -111,7 +112,7 @@</span><br><span> args = (remote_binary, self.remote_config_file)</span><br><span> args += tuple(self._additional_args)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- self.process = self.rem_host.RemoteProcess(srsENB.BINFILE, args, remote_env=remote_env)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.process = self.rem_host.RemoteProcessSafeExit(srsENB.BINFILE, self.remote_run_dir, args, remote_env=remote_env, wait_time_sec=7)</span><br><span> self.testenv.remember_to_stop(self.process)</span><br><span> self.process.launch()</span><br><span> </span><br><span>@@ -152,14 +153,14 @@</span><br><span> self.rem_host = remote.RemoteHost(self.run_dir, self.remote_user, self._addr)</span><br><span> remote_prefix_dir = util.Dir(srsENB.REMOTE_DIR)</span><br><span> self.remote_inst = util.Dir(remote_prefix_dir.child(os.path.basename(str(self.inst))))</span><br><span style="color: hsl(0, 100%, 40%);">- remote_run_dir = util.Dir(remote_prefix_dir.child(srsENB.BINFILE))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_run_dir = util.Dir(remote_prefix_dir.child(srsENB.BINFILE))</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- self.remote_config_file = remote_run_dir.child(srsENB.CFGFILE)</span><br><span style="color: hsl(0, 100%, 40%);">- self.remote_config_sib_file = remote_run_dir.child(srsENB.CFGFILE_SIB)</span><br><span style="color: hsl(0, 100%, 40%);">- self.remote_config_rr_file = remote_run_dir.child(srsENB.CFGFILE_RR)</span><br><span style="color: hsl(0, 100%, 40%);">- self.remote_config_drb_file = remote_run_dir.child(srsENB.CFGFILE_DRB)</span><br><span style="color: hsl(0, 100%, 40%);">- self.remote_log_file = remote_run_dir.child(srsENB.LOGFILE)</span><br><span style="color: hsl(0, 100%, 40%);">- self.remote_pcap_file = remote_run_dir.child(srsENB.PCAPFILE)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_config_file = self.remote_run_dir.child(srsENB.CFGFILE)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_config_sib_file = self.remote_run_dir.child(srsENB.CFGFILE_SIB)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_config_rr_file = self.remote_run_dir.child(srsENB.CFGFILE_RR)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_config_drb_file = self.remote_run_dir.child(srsENB.CFGFILE_DRB)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_log_file = self.remote_run_dir.child(srsENB.LOGFILE)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_pcap_file = self.remote_run_dir.child(srsENB.PCAPFILE)</span><br><span> </span><br><span> values = super().configure(['srsenb'])</span><br><span> </span><br><span>@@ -211,7 +212,7 @@</span><br><span> if not self.setup_runs_locally():</span><br><span> self.rem_host.recreate_remote_dir(self.remote_inst)</span><br><span> self.rem_host.scp('scp-inst-to-remote', str(self.inst), remote_prefix_dir)</span><br><span style="color: hsl(0, 100%, 40%);">- self.rem_host.recreate_remote_dir(remote_run_dir)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rem_host.recreate_remote_dir(self.remote_run_dir)</span><br><span> self.rem_host.scp('scp-cfg-to-remote', self.config_file, self.remote_config_file)</span><br><span> self.rem_host.scp('scp-cfg-sib-to-remote', self.config_sib_file, self.remote_config_sib_file)</span><br><span> self.rem_host.scp('scp-cfg-rr-to-remote', self.config_rr_file, self.remote_config_rr_file)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18453">change 18453</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/+/18453"/><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: I905bd753c7822feccf1c1bb59752698f1d1b85f0 </div>
<div style="display:none"> Gerrit-Change-Number: 18453 </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-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>