]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
stdin-killer: do not setpgrp if already leader 1881/head
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 4 Aug 2023 13:17:28 +0000 (09:17 -0400)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 4 Aug 2023 15:35:40 +0000 (11:35 -0400)
Fixes failure like:

    2023-08-03T19:40:10.942 INFO:teuthology.orchestra.run.smithi100.stderr:Traceback (most recent call last):
    2023-08-03T19:40:10.942 INFO:teuthology.orchestra.run.smithi100.stderr:  File "/usr/bin/stdin-killer", line 213, in <module>
    2023-08-03T19:40:10.943 INFO:teuthology.orchestra.run.smithi100.stderr:    os.setpgrp()
    2023-08-03T19:40:10.943 INFO:teuthology.orchestra.run.smithi100.stderr:PermissionError: [Errno 1] Operation not permitted

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
teuthology/task/install/bin/stdin-killer

index 8a78744a3eb9d7f1802b9a9c6ab7c677d5ed967f..d5ff230b231feb17164424029b2e6ea9b16b0d9d 100755 (executable)
@@ -210,8 +210,10 @@ if __name__ == "__main__":
     }
 
     if NS.setpgrp == "self":
-        os.setpgrp()
         pgrp = os.getpgrp()
+        if pgrp != os.getpid():
+            os.setpgrp()
+            pgrp = os.getpgrp()
     elif NS.setpgrp == "child":
         popen_kwargs["preexec_fn"] = os.setpgrp
         pgrp = None