summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJürg Billeter <j@bitron.ch>2020-04-08 18:16:59 +0200
committerJürg Billeter <j@bitron.ch>2020-04-08 18:20:51 +0200
commit227a569b4dc19aec96c53210d97669832c7cfe3c (patch)
tree70f8302e7a175566a6396b104e7e60945faa6aec
parent7e16744524295b4c81ef9f5f67a0c108534e8521 (diff)
downloadbuildstream-juerg/job-sigterm.tar.gz
_sandboxbuildboxrun.py: Reduce SIGTERM timeout to 15sjuerg/job-sigterm
The scheduler timeout for `SIGTERM` of job processes is 20s. The timeout in the sandbox backend should be shorter to allow graceful termination of the job process even when `buildbox-run` fails to terminate gracefully.
-rw-r--r--src/buildstream/sandbox/_sandboxbuildboxrun.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/buildstream/sandbox/_sandboxbuildboxrun.py b/src/buildstream/sandbox/_sandboxbuildboxrun.py
index d3b9e4da6..f6ecbeaa0 100644
--- a/src/buildstream/sandbox/_sandboxbuildboxrun.py
+++ b/src/buildstream/sandbox/_sandboxbuildboxrun.py
@@ -130,7 +130,7 @@ class SandboxBuildBoxRun(SandboxREAPI):
proc.terminate()
try:
- proc.wait(20)
+ proc.wait(15)
except psutil.TimeoutExpired:
utils._kill_process_tree(process.pid)