From bdfac35f3f3695286bf019d4e0df5a497dafc89f Mon Sep 17 00:00:00 2001
From: Chris Meyers <chris.meyers.fsu@gmail.com>
Date: Wed, 14 Dec 2016 16:26:18 -0500
Subject: [PATCH] cancel job also cancels project update

related to #4225
---
 awx/main/models/jobs.py |  9 +++++++++
 awx/main/tasks.py       | 20 +++++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py
index b7acf21775..b0b98cb955 100644
--- a/awx/main/models/jobs.py
+++ b/awx/main/models/jobs.py
@@ -654,6 +654,15 @@ class Job(UnifiedJob, JobOptions, SurveyJobMixin, JobNotificationMixin):
     def get_notification_friendly_name(self):
         return "Job"
 
+    '''
+    Canceling a job also cancels the implicit project update with launch_type
+    run.
+    '''
+    def cancel(self):
+        res = super(Job, self).cancel()
+        if self.project_update:
+            self.project_update.cancel()
+        return res
 
 class JobHostSummary(CreatedModifiedModel):
     '''
diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index e0dcae0fca..6e7a1db6c5 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -708,6 +708,11 @@ class BaseTask(Task):
                 stdout_handle.close()
             except Exception:
                 pass
+
+        instance = self.update_model(pk)
+        if instance.cancel_flag:
+            status = 'canceled'
+
         instance = self.update_model(pk, status=status, result_traceback=tb,
                                      output_replacements=output_replacements,
                                      **extra_update_fields)
@@ -1044,17 +1049,18 @@ class RunJob(BaseTask):
             local_project_sync = job.project.create_project_update(launch_type="sync")
             local_project_sync.job_type = 'run'
             local_project_sync.save()
+            # save the associated project update before calling run() so that a
+            # cancel() call on the job can cancel the project update
+            job = self.update_model(job.pk, project_update=local_project_sync)
+
             project_update_task = local_project_sync._get_task_class()
             try:
                 project_update_task().run(local_project_sync.id)
-                job.scm_revision = job.project.scm_revision
-                job.project_update = local_project_sync
-                job.save()
+                job = self.update_model(job.pk, scm_revision=project.scm_revision)
             except Exception:
-                job.status = 'failed'
-                job.job_explanation = 'Previous Task Failed: {"job_type": "%s", "job_name": "%s", "job_id": "%s"}' % \
-                                      ('project_update', local_project_sync.name, local_project_sync.id)
-                job.save()
+                job = self.update_model(job.pk, status='failed',
+                        job_explanation='Previous Task Failed: {"job_type": "%s", "job_name": "%s", "job_id": "%s"}' % \
+                                        ('project_update', local_project_sync.name, local_project_sync.id))
                 raise
 
     def post_run_hook(self, job, status, **kwargs):