summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Davis <mdavis@ansible.com>2017-05-16 17:32:31 -0700
committerBrian Coca <brian.coca+git@gmail.com>2017-05-18 14:59:31 -0400
commitc7b3e420b7ee694ee35bda608ef6725529c7f36e (patch)
treecb7111a8aade87ef478f411542effc5c053ac591
parentac8cb2a106438bc610f12f7ff4c3401c2521022c (diff)
downloadansible-c7b3e420b7ee694ee35bda608ef6725529c7f36e.tar.gz
add segfault detection to TQM
* prevents indefinite hangs when a worker segfaults (cherry picked from commit 569377e95105063c96bee55f859ac4df286904b5)
-rw-r--r--lib/ansible/executor/task_queue_manager.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/executor/task_queue_manager.py b/lib/ansible/executor/task_queue_manager.py
index a68eb70a38..ea1ede9db5 100644
--- a/lib/ansible/executor/task_queue_manager.py
+++ b/lib/ansible/executor/task_queue_manager.py
@@ -333,7 +333,7 @@ class TaskQueueManager:
defunct = False
for idx,x in enumerate(self._workers):
if hasattr(x[0], 'exitcode'):
- if x[0].exitcode in [-9, -15]:
+ if x[0].exitcode in [-9, -11, -15]:
defunct = True
return defunct