cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Catch worker errors that may be subclassed on others that lead to incorrect exits

Browse source
This commit is contained in:
James Cammarata 2015-09-17 14:46:53 -04:00
parent 053c41e79d
commit bde5ed9672
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/ansible/executor/process/worker.py
View file

@ -20,6 +20,7 @@ from __future__ import (absolute_import, division, print_function)
__metaclass__ = type __metaclass__ = type
from six.moves import queue from six.moves import queue
import multiprocessing import multiprocessing
import os import os
import signal import signal
@ -27,6 +28,8 @@ import sys
import time import time
import traceback import traceback
from jinja2.exceptions import TemplateNotFound
# TODO: not needed if we use the cryptography library with its default RNG # TODO: not needed if we use the cryptography library with its default RNG
# engine # engine
HAS_ATFORK=True HAS_ATFORK=True
@ -127,8 +130,6 @@ class WorkerProcess(multiprocessing.Process):
except queue.Empty: except queue.Empty:
pass pass
except (IOError, EOFError, KeyboardInterrupt):
break
except AnsibleConnectionFailure: except AnsibleConnectionFailure:
try: try:
if task: if task:
@ -138,15 +139,18 @@ class WorkerProcess(multiprocessing.Process):
# FIXME: most likely an abort, catch those kinds of errors specifically # FIXME: most likely an abort, catch those kinds of errors specifically
break break
except Exception as e: except Exception as e:
debug("WORKER EXCEPTION: %s" % e) if isinstance(e, (IOError, EOFError, KeyboardInterrupt)) and not isinstance(e, TemplateNotFound):
debug("WORKER EXCEPTION: %s" % traceback.format_exc())
try:
if task:
task_result = TaskResult(host, task, dict(failed=True, exception=traceback.format_exc(), stdout=''))
self._rslt_q.put(task_result, block=False)
except:
# FIXME: most likely an abort, catch those kinds of errors specifically
break break
else:
try:
if task:
task_result = TaskResult(host, task, dict(failed=True, exception=traceback.format_exc(), stdout=''))
self._rslt_q.put(task_result, block=False)
except:
debug("WORKER EXCEPTION: %s" % e)
debug("WORKER EXCEPTION: %s" % traceback.format_exc())
# FIXME: most likely an abort, catch those kinds of errors specifically
break
debug("WORKER PROCESS EXITING") debug("WORKER PROCESS EXITING")