From 229d8f6b21109e4180e457d95765379d07af384e Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 6 Jul 2016 16:26:50 -0500 Subject: [PATCH] Don't treat parsing problems as async task timeout (#16458) * Don't treat parsing problems as async task timeout If there is a problem reading/writing the status file that manifests as not being able to parse the data, that doesn't mean the task timed out, it means there was what was likely a tempoarary problem. Move on and keep polling for success. The only things that should cause the async status to not be parseable are bugs in the async_runner. * Add comment explaining not bailing out of loop * Return different error when result is unparseable * Remove extraneous else --- lib/ansible/executor/task_executor.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/ansible/executor/task_executor.py b/lib/ansible/executor/task_executor.py index 7943f0d15b..50762dfcf3 100644 --- a/lib/ansible/executor/task_executor.py +++ b/lib/ansible/executor/task_executor.py @@ -576,13 +576,21 @@ class TaskExecutor: time.sleep(self._task.poll) async_result = normal_handler.run() - if int(async_result.get('finished', 0)) == 1 or 'failed' in async_result or 'skipped' in async_result: + # We do not bail out of the loop in cases where the failure + # is associated with a parsing error. The async_runner can + # have issues which result in a half-written/unparseable result + # file on disk, which manifests to the user as a timeout happening + # before it's time to timeout. + if int(async_result.get('finished', 0)) == 1 or ('failed' in async_result and async_result.get('parsed', True)) or 'skipped' in async_result: break time_left -= self._task.poll if int(async_result.get('finished', 0)) != 1: - return dict(failed=True, msg="async task did not complete within the requested time") + if async_result.get('parsed'): + return dict(failed=True, msg="async task did not complete within the requested time") + else: + return dict(failed=True, msg="async task produced unparseable results", async_result=async_result) else: return async_result