<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18983">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ms_srs: fix scp-back-metrics routine<br><br>every call to verify_metrics would copy back metrics again. see log here:<br><br>23:29:22.149299 run srsue(pid=31521): Terminating (SIGINT)<br>23:29:22.368263 run srsue(pid=31521): Terminated: ok {rc=0}<br>23:29:28.401035 run scp-back-metrics(pid=32265): Launched<br>23:29:29.423083 run scp-back-metrics(pid=32265): Terminated: ok {rc=0}<br>23:29:29.490275 run scp-back-metrics(pid=32271): Launched<br>23:29:30.513852 run scp-back-metrics(pid=32271): Terminated: ok {rc=0}<br>23:29:30.550862 run scp-back-metrics(pid=32277): Launched<br>23:29:31.573962 run scp-back-metrics(pid=32277): Terminated: ok {rc=0}<br><br>this patch only copies back metrics only once. also make sure that, similar<br>to logs, metrics are always copied back at the end of the run even if they<br>are not used for metrics checking. this is needed to run the plotting<br>script.<br><br>Change-Id: Ie7c156a5b2c8768bf90ff8e86515976e0d454c25<br>---<br>M src/osmo_gsm_tester/obj/ms_srs.py<br>1 file changed, 27 insertions(+), 11 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 cf2e166..57721ac 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>@@ -81,6 +81,7 @@</span><br><span> self.log_file = None</span><br><span> self.pcap_file = None</span><br><span> self.metrics_file = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.have_metrics_file = False</span><br><span> self.process = None</span><br><span> self.rem_host = None</span><br><span> self.remote_inst = None</span><br><span>@@ -107,6 +108,7 @@</span><br><span> self.sleep_after_stop()</span><br><span> </span><br><span> # copy back files (may not exist, for instance if there was an early error of process):</span><br><span style="color: hsl(120, 100%, 40%);">+ self.scp_back_metrics(raiseException=False)</span><br><span> try:</span><br><span> self.rem_host.scpfrom('scp-back-log', self.remote_log_file, self.log_file)</span><br><span> except Exception as e:</span><br><span>@@ -117,6 +119,29 @@</span><br><span> except Exception as e:</span><br><span> self.log(repr(e))</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def scp_back_metrics(self, raiseException=True):</span><br><span style="color: hsl(120, 100%, 40%);">+ ''' Copy back metrics only if they have not been copied back yet '''</span><br><span style="color: hsl(120, 100%, 40%);">+ if not self.have_metrics_file:</span><br><span style="color: hsl(120, 100%, 40%);">+ # file is not properly flushed until the process has stopped.</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.running():</span><br><span style="color: hsl(120, 100%, 40%);">+ self.stop()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # only SCP back if not running locally</span><br><span style="color: hsl(120, 100%, 40%);">+ if not self._run_node.is_local():</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%);">+ if raiseException:</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%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ # only log error</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log(repr(e))</span><br><span style="color: hsl(120, 100%, 40%);">+ # make sure to only call it once</span><br><span style="color: hsl(120, 100%, 40%);">+ self.have_metrics_file = True</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.dbg('Metrics have already been copied back')</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def netns(self):</span><br><span> return "srsue1"</span><br><span> </span><br><span>@@ -362,17 +387,8 @@</span><br><span> raise log.Error('counter %s not implemented!' % counter_name)</span><br><span> </span><br><span> def verify_metric(self, value, operation='avg', metric='dl_brate', criterion='gt', window=1):</span><br><span style="color: hsl(0, 100%, 40%);">- # file is not properly flushed until the process has stopped.</span><br><span style="color: hsl(0, 100%, 40%);">- if self.running():</span><br><span style="color: hsl(0, 100%, 40%);">- self.stop()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if not self._run_node.is_local():</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(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ # copy back metrics if we have not already done so</span><br><span style="color: hsl(120, 100%, 40%);">+ self.scp_back_metrics(self)</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/+/18983">change 18983</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/+/18983"/><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: Ie7c156a5b2c8768bf90ff8e86515976e0d454c25 </div>
<div style="display:none"> Gerrit-Change-Number: 18983 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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-MessageType: merged </div>