Change in osmo-gsm-tester[master]: srsue: Use logfile instead of stdout

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

pespin gerrit-no-reply at lists.osmocom.org
Tue Mar 10 09:46:37 UTC 2020


pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17439 )

Change subject: srsue: Use logfile instead of stdout
......................................................................

srsue: Use logfile instead of stdout

newer srsLTE has fixes to exit properly after 3 seconds and then flush the log file.

Change-Id: I9801ce932ad08b7fbb6d14a66e1dba64d4af38f7
---
M src/osmo_gsm_tester/srs_ue.py
1 file changed, 7 insertions(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, approved



diff --git a/src/osmo_gsm_tester/srs_ue.py b/src/osmo_gsm_tester/srs_ue.py
index 20a5001..9743848 100644
--- a/src/osmo_gsm_tester/srs_ue.py
+++ b/src/osmo_gsm_tester/srs_ue.py
@@ -83,6 +83,12 @@
             return
         if self.setup_runs_locally():
             return
+        # When using zmq, srsUE is known to hang for a few seconds before
+        # exiting (3 seconds after alarm() watchdog kicks in). We hence need to
+        # wait to make sure the remote process terminated and the file was
+        # flushed, since cleanup() triggered means only the local ssh client was killed.
+        if self._conf and self._conf.get('rf_dev_type', '') == 'zmq':
+            MainLoop.sleep(self, 3)
         # copy back files (may not exist, for instance if there was an early error of process):
         try:
             self.rem_host.scpfrom('scp-back-log', self.remote_log_file, self.log_file)
@@ -154,7 +160,7 @@
         args = (remote_binary, self.remote_config_file,
                 '--phy.nof_phy_threads=1',
                 '--gw.netns=' + self.netns(),
-                '--log.filename=' + 'stdout', #self.remote_log_file,
+                '--log.filename=' + self.remote_log_file,
                 '--pcap.filename=' + self.remote_pcap_file,
                 '--general.metrics_csv_filename=' + self.remote_metrics_file)
 

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17439
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I9801ce932ad08b7fbb6d14a66e1dba64d4af38f7
Gerrit-Change-Number: 17439
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200310/7a71b33e/attachment.htm>


More information about the gerrit-log mailing list