stdin-killer: do not setpgrp if already leader

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 <[email protected]>
ceph · Aug 4, 2023 · b5bd9a5 · b5bd9a5
1 parent ce5f6d5
commit b5bd9a5
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/teuthology/task/install/bin/stdin-killer b/teuthology/task/install/bin/stdin-killer
@@ -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