External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-07 03:31:10 -03:30
Code Issues Packages Projects Releases Wiki Activity

Improve error handling / display when Ansible Runner errors

Browse Source
This commit is contained in:
Shane McDonald
2021-04-26 17:35:20 -04:00
parent 1e7b7d1a30
commit 8374b41e21
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/main/tasks.py
View File

@@ -1279,6 +1279,10 @@ class BaseTask(object):
if k in job_env: if k in job_env:
job_env[k] = v job_env[k] = v
self.instance = self.update_model(self.instance.pk, job_args=json.dumps(runner_config.command), job_cwd=runner_config.cwd, job_env=job_env) self.instance = self.update_model(self.instance.pk, job_args=json.dumps(runner_config.command), job_cwd=runner_config.cwd, job_env=job_env)
elif status_data['status'] == 'error':
result_traceback = status_data.get('result_traceback', None)
if result_traceback:
self.instance = self.update_model(self.instance.pk, result_traceback=result_traceback)
def check_handler(self, config): def check_handler(self, config):
""" """
@@ -3002,6 +3006,8 @@ class AWXReceptorJob:
# TODO: There should be a more efficient way of getting this information # TODO: There should be a more efficient way of getting this information
receptor_work_list = receptor_ctl.simple_command("work list") receptor_work_list = receptor_ctl.simple_command("work list")
detail = receptor_work_list[self.unit_id]['Detail'] detail = receptor_work_list[self.unit_id]['Detail']
state_name = receptor_work_list[self.unit_id]['StateName']
if 'exceeded quota' in detail: if 'exceeded quota' in detail:
logger.warn(detail) logger.warn(detail)
log_name = self.task.instance.log_format log_name = self.task.instance.log_format
@@ -3009,6 +3015,11 @@ class AWXReceptorJob:
self.task.update_model(self.task.instance.pk, status='pending') self.task.update_model(self.task.instance.pk, status='pending')
return return
# If ansible-runner ran, but an error occured at runtime, the traceback information
# is saved via the status_handler passed in to the processor.
if state_name == 'Succeeded':
return res
raise RuntimeError(detail) raise RuntimeError(detail)
return res return res