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

cancel job if receptor no longer knows about the work item

Browse Source
This commit is contained in:
Jim Ladd 2021-10-15 16:49:14 -07:00 committed by Shane McDonald
parent ebb4581595
commit 26055de772
No known key found for this signature in database
GPG Key ID: 6F374AF6E9EB9374
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
awx/main/tasks.py
View File

@ -3134,7 +3134,7 @@ class AWXReceptorJob:
unit_status = receptor_ctl.simple_command(f'work status {self.unit_id}')
detail = unit_status.get('Detail', None)
state_name = unit_status.get('StateName', None)
except RuntimeError as e:
except RuntimeError:
detail = ''
state_name = ''
logger.exception(f'Unable to retrieve work status for {self.unit_id}')
@ -3145,6 +3145,11 @@ class AWXReceptorJob:
logger.warn(f"Could not launch pod for {log_name}. Exceeded quota.")
self.task.update_model(self.task.instance.pk, status='pending')
return
# if we did not exceed the quota, continue with shutting down the job
resultsock.shutdown(socket.SHUT_RDWR)
resultfile.close()
# 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':
@ -3224,10 +3229,21 @@ class AWXReceptorJob:
@cleanup_new_process
def cancel_watcher(self, processor_future):
receptor_ctl = get_receptor_ctl()
while True:
if processor_future.done():
return processor_future.result()
# cancel job if receptor no longer knows about work item
try:
receptor_ctl.simple_command(f'work status {self.unit_id}')
except RuntimeError:
self.task.instance.result_traceback = traceback.format_exc()
self.task.instance.save(update_fields=['result_traceback'])
result = namedtuple('result', ['status', 'rc'])
return result('error', 1)
if self.task.cancel_callback():
result = namedtuple('result', ['status', 'rc'])
return result('canceled', 1)