diff options
| author | Jürg Billeter <j@bitron.ch> | 2020-04-08 18:16:59 +0200 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2020-04-09 17:53:24 +0000 |
| commit | 18c9cdd7bb0d8ff74168a7ebf180606a98507ed0 (patch) | |
| tree | 4abadbafe36e005192bcdc19680941ac84dc3446 | |
| parent | 637a1259822a64da0c6758d3632f0cc990a49520 (diff) | |
| download | buildstream-18c9cdd7bb0d8ff74168a7ebf180606a98507ed0.tar.gz | |
_sandboxbuildboxrun.py: Reduce SIGTERM timeout to 15s
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.py | 2 |
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) |