Use sigkill instead of sigterm on a stale process

Only hanging process recorded so far is gsutil. Sending sigterm doesn't
result in successfully terminating the process. Instead, use sigkill.

R=gavinmak@google.com

Bug: 1255228
Change-Id: Iad354284422676df804c68cb6f18c7db723bf862
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3232250
Auto-Submit: Josip Sokcevic <sokcevic@google.com>
Reviewed-by: Gavin Mak <gavinmak@google.com>
Commit-Queue: Gavin Mak <gavinmak@google.com>
changes/50/3232250/2
Josip Sokcevic 4 years ago committed by LUCI CQ
parent f153151a0b
commit 1efe7c7e7b

@ -165,9 +165,9 @@ def _print_pstree():
subprocess.call(['ps', 'auxwwf'])
def _terminate_process(proc):
print('Terminating stale process...')
proc.terminate()
def _kill_process(proc):
print('Killing stale process...')
proc.kill()
# TODO(crbug.com/1227140): Clean up when py2 is no longer supported.
@ -205,7 +205,7 @@ def call(*args, **kwargs): # pragma: no cover
proc = subprocess.Popen(args, **kwargs)
observers = [
RepeatingTimer(300, _print_pstree),
RepeatingTimer(int(stale_process_duration), _terminate_process, [proc])]
RepeatingTimer(int(stale_process_duration), _kill_process, [proc])]
for observer in observers:
observer.start()

Loading…
Cancel
Save