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

Merge pull request #11448 from AlanCoding/revert_again

Browse Source 
Revert "cancel job if receptor no longer knows about the work item"
This commit is contained in:
Alan Rominger 2021-12-10 16:35:12 -05:00 committed by GitHub
commit 21895bd09b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
awx/main/tasks.py
View File

@ -3168,11 +3168,6 @@ 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':
@ -3256,21 +3251,10 @@ 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)