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

Adjust the behavior of the cancel action

Browse Source 
For pending and waiting jobs this should set the cancel status
immediately. For running jobs it should just set the cancel flag and let
the running job set the cancelled status itself during its cancelation
procedure.  This also prevents a race condition where the task manager
will start dependent jobs before realizing the status is cancelled.
This commit is contained in:
Matthew Jones 2015-01-23 10:16:54 -05:00
parent cdd61d5b9f
commit ea8537ac71
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/models/unified_jobs.py
View File

@ -783,8 +783,11 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
if self.can_cancel:
if not self.cancel_flag:
self.cancel_flag = True
self.status = 'canceled'
self.save(update_fields=['cancel_flag', 'status'])
cancel_fields = ['cancel_flag']
if self.status in ('pending', 'waiting'):
self.status = 'canceled'
cancel_fields.append('status')
self.save(update_fields=cancel_fields)
self.socketio_emit_status("canceled")
if settings.BROKER_URL.startswith('amqp://'):
self._force_cancel()