<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13532">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Pau Espin Pedrol: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">processes: Fix kill of processes run under sudo<br><br>sudo drops forwarding of signals sent by processes of the same<br>process group, which means by default will drop signals from<br>parent and children processes. By moving it to another group, we<br>will later be able to kill it.<br>Note: sudo documentation is wrong, since it states it only drops<br>signals from children.<br><br>See following link for more information:<br>https://stackoverflow.com/questions/34337840/cant-terminate-a-sudo-process-created-with-python-in-ubuntu-15-10<br><br>Change-Id: I25990234aaa496c501ff45ad7f7fd549d6f188da<br>---<br>M src/osmo_gsm_tester/process.py<br>1 file changed, 11 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py</span><br><span>index 66ecae5..4b22d0c 100644</span><br><span>--- a/src/osmo_gsm_tester/process.py</span><br><span>+++ b/src/osmo_gsm_tester/process.py</span><br><span>@@ -157,16 +157,27 @@</span><br><span>         return f</span><br><span> </span><br><span>     def launch(self):</span><br><span style="color: hsl(120, 100%, 40%);">+        preexec_fn = None</span><br><span>         log.dbg('cd %r; %s %s' % (</span><br><span>                 os.path.abspath(str(self.run_dir)),</span><br><span>                 ' '.join(['%s=%r'%(k,v) for k,v in self.popen_kwargs.get('env', {}).items()]),</span><br><span>                 ' '.join(self.popen_args)))</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+        if self.popen_args[0] == "sudo":</span><br><span style="color: hsl(120, 100%, 40%);">+            # sudo drops forwarding of signals sent by processes of the same</span><br><span style="color: hsl(120, 100%, 40%);">+            # process group, which means by default will drop signals from</span><br><span style="color: hsl(120, 100%, 40%);">+            # parent and children processes. By moving it to another group, we</span><br><span style="color: hsl(120, 100%, 40%);">+            # will later be able to kill it.</span><br><span style="color: hsl(120, 100%, 40%);">+            # Note: sudo documentation is wrong, since it states it only drops</span><br><span style="color: hsl(120, 100%, 40%);">+            # signals from children.</span><br><span style="color: hsl(120, 100%, 40%);">+            preexec_fn = os.setpgrp</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>         self.process_obj = subprocess.Popen(</span><br><span>             self.popen_args,</span><br><span>             stdout=self.make_output_log('stdout'),</span><br><span>             stderr=self.make_output_log('stderr'),</span><br><span>             stdin=subprocess.PIPE,</span><br><span style="color: hsl(120, 100%, 40%);">+            preexec_fn=preexec_fn,</span><br><span>             shell=False,</span><br><span>             cwd=self.run_dir.path,</span><br><span>             **self.popen_kwargs)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13532">change 13532</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/13532"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I25990234aaa496c501ff45ad7f7fd549d6f188da </div>
<div style="display:none"> Gerrit-Change-Number: 13532 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>