Merge pull request #583 from Shopify/dont-renqueue-stopped-throttled-jobs

Don't re-enqueue stopped throttled jobs

Author: etiennebarrie

Gemfile.lock

@@ -5,7 +5,7 @@ PATH
       actionpack (>= 6.0)
       activejob (>= 6.0)
       activerecord (>= 6.0)
-      job-iteration (~> 1.1)
+      job-iteration (~> 1.3.6)
       railties (>= 6.0)
 
 GEM
@@ -98,10 +98,10 @@ GEM
     erubi (1.10.0)
     globalid (1.0.0)
       activesupport (>= 5.0)
-    i18n (1.9.1)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     io-wait (0.2.1)
-    job-iteration (1.3.5)
+    job-iteration (1.3.6)
       activejob (>= 5.2)
     loofah (2.14.0)
       crass (~> 1.0.2)

app/jobs/concerns/maintenance_tasks/task_job_concern.rb

@@ -152,7 +152,7 @@ def reenqueue_iteration_job(should_ignore: true)
     def after_perform
       @run.persist_transition
       if defined?(@reenqueue_iteration_job) && @reenqueue_iteration_job
-        reenqueue_iteration_job(should_ignore: false)
+        reenqueue_iteration_job(should_ignore: false) unless @run.stopped?
       end
     end
 

maintenance_tasks.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency("actionpack", ">= 6.0")
   spec.add_dependency("activejob", ">= 6.0")
   spec.add_dependency("activerecord", ">= 6.0")
-  spec.add_dependency("job-iteration", "~> 1.1")
+  spec.add_dependency("job-iteration", "~> 1.3.6")
   spec.add_dependency("railties", ">= 6.0")
 end

test/jobs/maintenance_tasks/task_job_test.rb

@@ -407,6 +407,22 @@ class << self
       assert_predicate run.reload, :succeeded?
     end
 
+    test ".perform_now with a throttle doesn't enqueue a job if run is stopping" do
+      run = Run.create!(task_name: "Maintenance::UpdatePostsThrottledTask")
+      Maintenance::UpdatePostsThrottledTask.any_instance
+        .expects(:process).once.with do
+        run.cancelling!
+        Maintenance::UpdatePostsThrottledTask.throttle = true
+      end
+
+      TaskJob.perform_now(run)
+
+      assert_predicate(run.reload, :cancelled?)
+      assert_empty(enqueued_jobs)
+    ensure
+      Maintenance::UpdatePostsThrottledTask.throttle = false
+    end
+
     test ".perform_now makes arguments supplied for Task parameters available" do
       post = Post.last
       Maintenance::ParamsTask.any_instance.expects(:process).once.with(post)