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

Merge pull request #12961 from fosterseth/fix_results_traceback

Browse Source 
Result_traceback should not include job stdout
This commit is contained in:
Seth Foster
2023-01-03 13:34:23 -05:00
committed by GitHub
parent b5452a48f8 36c0d07b30
commit ee509aea56
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
awx/main/tasks/receptor.py
View File

@@ -411,9 +411,11 @@ class AWXReceptorJob:
unit_status = receptor_ctl.simple_command(f'work status {self.unit_id}') unit_status = receptor_ctl.simple_command(f'work status {self.unit_id}')
detail = unit_status.get('Detail', None) detail = unit_status.get('Detail', None)
state_name = unit_status.get('StateName', None) state_name = unit_status.get('StateName', None)
stdout_size = unit_status.get('StdoutSize', 0)
except Exception: except Exception:
detail = '' detail = ''
state_name = '' state_name = ''
stdout_size = 0
logger.exception(f'An error was encountered while getting status for work unit {self.unit_id}') logger.exception(f'An error was encountered while getting status for work unit {self.unit_id}')
if 'exceeded quota' in detail: if 'exceeded quota' in detail:
@@ -424,9 +426,16 @@ class AWXReceptorJob:
return return
try: try:
resultsock = receptor_ctl.get_work_results(self.unit_id, return_sockfile=True) receptor_output = ''
lines = resultsock.readlines() if state_name == 'Failed' and self.task.runner_callback.event_ct == 0:
receptor_output = b"".join(lines).decode() # if receptor work unit failed and no events were emitted, work results may
# contain useful information about why the job failed. In case stdout is
# massive, only ask for last 1000 bytes
startpos = max(stdout_size - 1000, 0)
resultsock, resultfile = receptor_ctl.get_work_results(self.unit_id, startpos=startpos, return_socket=True, return_sockfile=True)
resultsock.setblocking(False) # this makes resultfile reads non blocking
lines = resultfile.readlines()
receptor_output = b"".join(lines).decode()
if receptor_output: if receptor_output:
self.task.runner_callback.delay_update(result_traceback=receptor_output) self.task.runner_callback.delay_update(result_traceback=receptor_output)
elif detail: elif detail: