External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-14 12:57:40 -02:30
Code Issues Packages Projects Releases Wiki Activity

Apply a failed status if cancel_flag is not set

Browse Source
This commit is contained in:
Alan Rominger
2022-07-19 16:18:45 -04:00
parent 621833ef0e
commit 1ea3c564df
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/main/tasks/jobs.py
View File

@@ -608,12 +608,18 @@ class BaseTask(object):
status = 'failed' status = 'failed'
elif status == 'canceled': elif status == 'canceled':
self.instance = self.update_model(pk) self.instance = self.update_model(pk)
if (getattr(self.instance, 'cancel_flag', False) is False) and signal_callback(): cancel_flag_value = getattr(self.instance, 'cancel_flag', False)
# MERGE: prefer devel over this with runner_callback.delay_update() if (cancel_flag_value is False) and signal_callback():
# MERGE: prefer devel over this with runner_callback.delay_update(), and for elif case too
job_explanation = "Task was canceled due to receiving a shutdown signal." job_explanation = "Task was canceled due to receiving a shutdown signal."
self.instance.job_explanation = self.instance.job_explanation or job_explanation self.instance.job_explanation = self.instance.job_explanation or job_explanation
extra_update_fields['job_explanation'] = self.instance.job_explanation extra_update_fields['job_explanation'] = self.instance.job_explanation
status = 'failed' status = 'failed'
elif cancel_flag_value is False:
job_explanation = "The running ansible process received a shutdown signal."
self.instance.job_explanation = self.instance.job_explanation or job_explanation
extra_update_fields['job_explanation'] = self.instance.job_explanation
status = 'failed'
except ReceptorNodeNotFound as exc: except ReceptorNodeNotFound as exc:
self.runner_callback.delay_update(job_explanation=str(exc)) self.runner_callback.delay_update(job_explanation=str(exc))
except Exception: except Exception: