maintenance_tasks 1.10.2 → 1.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8035a01cd9e715fec1b276b2f1c609266daeca88fa13d49ee1e2993370103f87
-  data.tar.gz: b6ec7e053b256aa725cd3c23f932fe35b480b2398667cdc2ba9e72b3059ca614
+  metadata.gz: de43aad0e8d7479e1f7a88d8f664e20213d42455ca85ef22e074e2321b9a183b
+  data.tar.gz: 65bae8e5b9f793e5cd4dc08dfee03611378007d571d5fc027b349faa7c358b74
 SHA512:
-  metadata.gz: 49aa01470360b4cde07fe1ce1d6a47158924fe0acca500ca21237374244c23a63560f4ea3fa03ec3f0dfae1ae8bb211817999b79c3057f1486f1c46ac75faab6
-  data.tar.gz: 85ac09e52d9396e83254fd1f0451e6627542a7fed4238397960b14b4c14112f71dc7f51600a8f650331bc9f74192e98e962537bb472021903e5a7fd93dfcec02
+  metadata.gz: 5b088335a8ef4a0e1e92d376f4c5c2d2c05ca2dea2e07aa983f21783ce5a7bff53cf3b4f2a75607d67fea144119078f563882f6e67c6fd09adc3d20ebac285a1
+  data.tar.gz: '0128f6891b9b0328b7ba80490b4843a70eb014ddb82295d50f7d22218164ac3e9ef1e7c08bb80e8aab0a4501e932a1d374e755e7f21bd709c996f33b3344575f'

data/app/models/maintenance_tasks/run.rb

@@ -29,6 +29,7 @@ module MaintenanceTasks
     STOPPING_STATUSES = [
       :pausing,
       :cancelling,
+      :cancelled,
     ]
     COMPLETED_STATUSES = [:succeeded, :errored, :cancelled]
     COMPLETED_RUNS_LIMIT = 10
@@ -137,7 +138,7 @@ module MaintenanceTasks
         backtrace: MaintenanceTasks.backtrace_cleaner.clean(error.backtrace),
         ended_at: Time.now,
       )
-      run_task_callbacks(:error)
+      run_error_callback
     rescue ActiveRecord::StaleObjectError
       reload_status
       retry
@@ -168,8 +169,10 @@ module MaintenanceTasks
       self
     end
 
-    # Returns whether the Run is stopping, which is defined as
-    # having a status of pausing or cancelled.
+    # Returns whether the Run is stopping, which is defined as having a status
+    # of pausing or cancelling. The status of cancelled is also considered
+    # stopping since a Run can be cancelled while its job still exists in the
+    # queue, and we want to handle it the same way as a cancelling run.
     #
     # @return [Boolean] whether the Run is stopping.
     def stopping?
@@ -259,7 +262,7 @@ module MaintenanceTasks
     #   specified by the Task.
     def start(count)
       update!(started_at: Time.now, tick_total: count)
-      run_task_callbacks(:start)
+      task.run_callbacks(:start)
     rescue ActiveRecord::StaleObjectError
       reload_status
       retry
@@ -272,6 +275,7 @@ module MaintenanceTasks
         self.ended_at = Time.now
       elsif pausing?
         self.status = :paused
+      elsif cancelled?
       else
         self.status = :interrupted
       end
@@ -412,6 +416,12 @@ module MaintenanceTasks
 
     def run_task_callbacks(callback)
       task.run_callbacks(callback)
+    rescue Task::NotFoundError
+      nil
+    end
+
+    def run_error_callback
+      task.run_callbacks(:error)
     rescue
       nil
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maintenance_tasks
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.10.3
 platform: ruby
 authors:
 - Shopify Engineering
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-12 00:00:00.000000000 Z
+date: 2022-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -152,7 +152,7 @@ homepage: https://github.com/Shopify/maintenance_tasks
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/Shopify/maintenance_tasks/tree/v1.10.2
+  source_code_uri: https://github.com/Shopify/maintenance_tasks/tree/v1.10.3
   allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []