<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11192">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmotrx: Make sure remote process stops after ssh session is closed<br><br>First of all, it was found that vty allocation must be forced (-t -t)<br>during ssh session creation to make sure SIGHUP is forwarded when<br>session is closed.<br><br>Second, since osmo-trx ignores SIGHUP (osmo_init_ignore_signals()), we<br>must add a wrapper script which converts received SIGHUP into a SIGINT<br>to stop osmo-trx.<br><br>Change-Id: Ic334a54b1a1827d74fe0b453ac32bb77b8616147<br>---<br>M src/osmo_gsm_tester/bts_osmotrx.py<br>M src/osmo_gsm_tester/process.py<br>2 files changed, 37 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/92/11192/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py</span><br><span>index 3ed596a..a1814dc 100644</span><br><span>--- a/src/osmo_gsm_tester/bts_osmotrx.py</span><br><span>+++ b/src/osmo_gsm_tester/bts_osmotrx.py</span><br><span>@@ -18,6 +18,7 @@</span><br><span> # along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span> </span><br><span> import os</span><br><span style="color: hsl(120, 100%, 40%);">+import stat</span><br><span> import pprint</span><br><span> import tempfile</span><br><span> from abc import ABCMeta, abstractmethod</span><br><span>@@ -142,6 +143,7 @@</span><br><span> </span><br><span> CONF_OSMO_TRX = 'osmo-trx.cfg'</span><br><span> REMOTE_DIR = '/osmo-gsm-tester-trx/last_run'</span><br><span style="color: hsl(120, 100%, 40%);">+ WRAPPER_SCRIPT = 'ssh_sigkiller.sh'</span><br><span> </span><br><span> ##############</span><br><span> # PROTECTED</span><br><span>@@ -207,6 +209,28 @@</span><br><span> proc.launch()</span><br><span> return proc</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def generate_wrapper_script(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ wrapper_script = self.run_dir.new_file(OsmoTrx.WRAPPER_SCRIPT)</span><br><span style="color: hsl(120, 100%, 40%);">+ with open(wrapper_script, 'w') as f:</span><br><span style="color: hsl(120, 100%, 40%);">+ r = """#!/bin/bash</span><br><span style="color: hsl(120, 100%, 40%);">+ mypid=0</span><br><span style="color: hsl(120, 100%, 40%);">+ sign_handler() {</span><br><span style="color: hsl(120, 100%, 40%);">+ sig=$1</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "received signal handler $sig, killing $mypid"</span><br><span style="color: hsl(120, 100%, 40%);">+ kill $mypid</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ trap 'sign_handler SIGINT' SIGINT</span><br><span style="color: hsl(120, 100%, 40%);">+ trap 'sign_handler SIGHUP' SIGHUP</span><br><span style="color: hsl(120, 100%, 40%);">+ "$@" &</span><br><span style="color: hsl(120, 100%, 40%);">+ mypid=$!</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "waiting for $mypid"</span><br><span style="color: hsl(120, 100%, 40%);">+ wait $mypid</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ f.write(r)</span><br><span style="color: hsl(120, 100%, 40%);">+ st = os.stat(wrapper_script)</span><br><span style="color: hsl(120, 100%, 40%);">+ os.chmod(wrapper_script, st.st_mode | stat.S_IEXEC)</span><br><span style="color: hsl(120, 100%, 40%);">+ return wrapper_script</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> ##############</span><br><span> # PUBLIC (test API included)</span><br><span> ##############</span><br><span>@@ -221,13 +245,21 @@</span><br><span> self.proc_trx = self.launch_process_local(keepalive, self.binary_name(),</span><br><span> '-C', os.path.abspath(self.config_file))</span><br><span> else:</span><br><span style="color: hsl(120, 100%, 40%);">+ # Run remotely through ssh. We need to run osmo-trx under a wrapper</span><br><span style="color: hsl(120, 100%, 40%);">+ # script since osmo-trx ignores SIGHUP and will keep running after</span><br><span style="color: hsl(120, 100%, 40%);">+ # we close local ssh session. The wrapper script catches SIGHUP and</span><br><span style="color: hsl(120, 100%, 40%);">+ # sends SIGINT to it.</span><br><span style="color: hsl(120, 100%, 40%);">+ wrapper_script = self.generate_wrapper_script()</span><br><span> remote_run_dir = util.Dir(OsmoTrx.REMOTE_DIR)</span><br><span> self.remote_inst = process.copy_inst_ssh(self.run_dir, self.inst, remote_run_dir, self.remote_user,</span><br><span> self.listen_ip, self.binary_name(), self.config_file)</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_wrapper_script = remote_run_dir.child(OsmoTrx.WRAPPER_SCRIPT)</span><br><span> remote_config_file = remote_run_dir.child(OsmoTrx.CONF_OSMO_TRX)</span><br><span> remote_lib = self.remote_inst.child('lib')</span><br><span> remote_binary = self.remote_inst.child('bin', self.binary_name())</span><br><span style="color: hsl(0, 100%, 40%);">- args = ('LD_LIBRARY_PATH=%s' % remote_lib, remote_binary, '-C', remote_config_file)</span><br><span style="color: hsl(120, 100%, 40%);">+ process.scp(self.run_dir, self.remote_user, self.listen_ip, 'scp-wrapper-to-remote', wrapper_script, remote_wrapper_script)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ args = ('LD_LIBRARY_PATH=%s' % remote_lib, remote_wrapper_script, remote_binary, '-C', remote_config_file)</span><br><span> self.proc_trx = self.launch_process_remote(self.binary_name(), args, remote_cwd=remote_run_dir, keepalive=keepalive)</span><br><span> </span><br><span> def trx_ready(self):</span><br><span>diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py</span><br><span>index 9db9241..534cdba 100644</span><br><span>--- a/src/osmo_gsm_tester/process.py</span><br><span>+++ b/src/osmo_gsm_tester/process.py</span><br><span>@@ -228,7 +228,10 @@</span><br><span> cd = 'cd "%s"; ' % self.remote_cwd</span><br><span> else:</span><br><span> cd = ''</span><br><span style="color: hsl(0, 100%, 40%);">- self.popen_args = ['ssh', self.remote_user+'@'+self.remote_host,</span><br><span style="color: hsl(120, 100%, 40%);">+ # We need double -t to force tty and be able to forward signals to</span><br><span style="color: hsl(120, 100%, 40%);">+ # processes (SIGHUP) when we close ssh on the local side. As a result,</span><br><span style="color: hsl(120, 100%, 40%);">+ # stderr seems to be merged into stdout in ssh client.</span><br><span style="color: hsl(120, 100%, 40%);">+ self.popen_args = ['ssh', '-t', '-t', self.remote_user+'@'+self.remote_host,</span><br><span> '%s%s' % (cd,</span><br><span> ' '.join(self.popen_args))]</span><br><span> self.dbg(self.popen_args, dir=self.run_dir, conf=self.popen_kwargs)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11192">change 11192</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/11192"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ic334a54b1a1827d74fe0b453ac32bb77b8616147 </div>
<div style="display:none"> Gerrit-Change-Number: 11192 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>