delayed_job_groups_plugin 0.14.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a151f3024b43407ef181bc42c113e97877160c37f48f1f68b793e533f001b88
-  data.tar.gz: d9f29810d2680e21956472ec485fe03f009765591cfadb9cb2fcaea17569c163
+  metadata.gz: 9d88649deb9812581de80f6a57a265ccfd265f7f9122d837eff527647f77f01b
+  data.tar.gz: 4979b4dd43fb9294fb622e478ac5bb36a7f688f83236183eac2fc80a668af828
 SHA512:
-  metadata.gz: 1a9b598b3f77a3256b6fbcca5ba5d1acd47c065c7d845fc19bf541ffe236779419f0439cf70ef82783c3185697305137acb8d0baf7eadc9f51d3796933d2e65d
-  data.tar.gz: b273960f4d058062e50c67a9144a6638f8574c97a72e5ec88a1388dc632778e3877c3e4f7218dc261789137e69382a0cd9d1600bc4800cb72b73f751c5dc93f8
+  metadata.gz: '083c6e1461374569d30d7538fb5a7e4d4f980cae04858bbac94793597f62d588a6078b6e55e605ee7e10ff413e0c6ef5460088cd50667663ceefdfc29543ae6a'
+  data.tar.gz: d4ede12f4275b606f0e0704ac3cfc255727f3796979ecff7aa87781629172d0e15ad6e1d0b96254bd845f243a7f8d7bc96f4c4bb670bf4d48be4e4a2590776a4

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 1.0.0
+### Breaking Changes
+- This library will fail to load if `Delayed::Worker.destroy_failed_jobs` is set to true.
+  Delayed::Job sets this option to true by default, you will need to configure it to false
+  in order to include this library.
+### Changes
+- Moves `on_cancellation` logic from the before delayed job lifecycle hook to the after hook.
+- Wrapped the job group cancel hook in a lock to prevent concurrently failing jobs from enqueueing
+  multiple on cancellation jobs.
+
 ## 0.14.0
 - Reverts changes made in version 0.13.
 

data/README.md

@@ -35,6 +35,15 @@ Run the required database migrations:
     $ rails generate delayed_job_groups_plugin:install
     $ rake db:migrate
 
+## Upgrading from 0.14.0
+
+This library is now incompatible with Delayed::Job's default setting for `destroy_failed_jobs`.
+In order to use Delayed Job Groups, you must set it to false while configuring Delayed::Job:
+
+```ruby
+Delayed::Worker.destroy_failed_jobs = false
+```
+
 ## Upgrading from 0.1.2
 run the following generator to create a migration for the new configuration column.
 
@@ -42,6 +51,7 @@ run the following generator to create a migration for the new configuration colu
     # add `default: true, null: false` to the generated migration for the failure_cancels_group column
     $ rake db:migrate
 
+
 ## Usage
 
 Creating a job group and queueing some jobs:

data/lib/delayed/job_groups/errors.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Delayed
+  module JobGroups
+    ConfigurationError = Class.new(StandardError)
+
+    class IncompatibleWithDelayedJobError < ConfigurationError
+      DEFAULT_MESSAGE = 'DelayedJobGroupsPlugin is incompatible with Delayed::Job ' \
+                        'when `destroy_failed_jobs` is set to `true`'
+
+      def initialize(msg = DEFAULT_MESSAGE)
+        super(msg)
+      end
+    end
+  end
+end

data/lib/delayed/job_groups/job_group.rb

@@ -62,8 +62,18 @@ module Delayed
       end
 
       def cancel
-        Delayed::Job.enqueue(on_cancellation_job, on_cancellation_job_options || {}) if on_cancellation_job
-        destroy
+        with_lock do
+          return if destroyed?
+
+          Delayed::Job.enqueue(on_cancellation_job, on_cancellation_job_options || {}) if on_cancellation_job
+          destroy
+        end
+      rescue ActiveRecord::RecordNotFound
+        # The first failing job to attempt cancelling the job group will enqueue the
+        # on cancellation job and destroy the group. Any other concurrently failing job
+        # in the same group can therefore silently return if the job group has already
+        # been destroyed.
+        nil
       end
 
       def check_for_completion(skip_pending_jobs_check: false)

data/lib/delayed/job_groups/plugin.rb

@@ -17,7 +17,13 @@ module Delayed
           end
         end
 
-        lifecycle.before(:failure) do |_worker, job|
+        # In order to allow individual jobs in the JobGroup to perform cleanup activities upon
+        # job failure, a JobGroups on cancellation job must be enqueued in the after failure
+        # delayed job lifecycle hook. If both were to be performed in the same hook, the job's
+        # failure hook and the on cancellation job may run at the same time since hook execution
+        # order is never guaranteed. This is particular important if the on cancellation job
+        # depends on state set in the failure hook of an individual job.
+        lifecycle.after(:failure) do |_worker, job|
           # If a job in the job group fails, then cancel the whole job group.
           # Need to check that the job group is present since another
           # job may have concurrently cancelled it.

data/lib/delayed/job_groups/railtie.rb

@@ -4,6 +4,17 @@ module Delayed
   module JobGroups
     class Railtie < ::Rails::Railtie
       config.after_initialize do
+
+        # On cancellation checks are performed in the after failure delayed job lifecycle, however
+        # https://github.com/collectiveidea/delayed_job/blob/master/lib/delayed/worker.rb#L268 may
+        # delete jobs before the hook runs. This could cause a successful job in the same group to
+        # complete the group instead of the group being cancelled. Therefore, we must ensure that
+        # the Delayed::Worker.destroy_failed_jobs is set to false, guaranteeing that the group is
+        # never empty if failure occurs.
+        if Delayed::Worker.destroy_failed_jobs && ActiveRecord::Base.connection.table_exists?(:delayed_job_groups)
+          raise Delayed::JobGroups::IncompatibleWithDelayedJobError
+        end
+
         Delayed::Backend::ActiveRecord::Job.include(Delayed::JobGroups::JobExtensions)
       end
     end

data/lib/delayed/job_groups/version.rb

@@ -2,6 +2,6 @@
 
 module Delayed
   module JobGroups
-    VERSION = '0.14.0'
+    VERSION = '1.0.0'
   end
 end

data/lib/delayed_job_groups_plugin.rb

@@ -4,6 +4,7 @@ require 'active_support'
 require 'active_record'
 require 'delayed_job'
 require 'delayed_job_active_record'
+require 'delayed/job_groups/errors'
 require 'delayed/job_groups/compatibility'
 require 'delayed/job_groups/complete_stuck_job_groups_job'
 require 'delayed/job_groups/job_extensions'
@@ -18,6 +19,7 @@ if defined?(Rails::Railtie)
 else
   # Do the same as in the railtie
   Delayed::Backend::ActiveRecord::Job.include(Delayed::JobGroups::JobExtensions)
+  raise Delayed::JobGroups::IncompatibleWithDelayedJobError if Delayed::Worker.destroy_failed_jobs
 end
 
 Delayed::Worker.plugins << Delayed::JobGroups::Plugin

data/lib/generators/delayed_job_groups_plugin/install_generator.rb

@@ -18,5 +18,37 @@ module DelayedJobGroupsPlugin
       ActiveRecord::Generators::Base.next_migration_number(dirname)
     end
 
+    def create_initializer
+      initializer_file = File.join('config/initializers', 'delayed_job_config.rb')
+      configuration_on_matcher = /Delayed::Worker\.destroy_failed_jobs\s*=\s*true/
+      configuration_off_matcher = /Delayed::Worker\.destroy_failed_jobs\s*=\s*false/
+
+      say 'Attempting to initialize delayed_job_config initializer...', :green
+
+      if File.exist?(initializer_file)
+        say 'delayed_job_config initializer already exists... checking destroy_failed_jobs options', :green
+        contents = File.read(initializer_file)
+        if contents.match(configuration_on_matcher)
+          say 'Delayed::Worker.destroy_failed_jobs is set to true', :red
+          say 'This library requires the option to be set to false, updating config now!', :yellow
+
+          gsub_file initializer_file, configuration_on_matcher, 'Delayed::Worker.destroy_failed_jobs = false'
+        elsif contents.match(configuration_off_matcher)
+          say 'Delayed::Worker.destroy_failed_jobs is set to false; nothing to do!', :green
+        else
+          say 'Delayed::Worker.destroy_failed_jobs is not set'
+          say 'This library requires the option to be set to false, updating config now!', :yellow
+          inject_into_file initializer_file, "Delayed::Worker.destroy_failed_jobs = false\n"
+        end
+      else
+        create_file initializer_file do
+          <<~RUBY
+            # frozen_string_literal: true
+
+            Delayed::Worker.destroy_failed_jobs = false
+          RUBY
+        end
+      end
+    end
   end
 end

data/spec/delayed/job_groups/job_group_spec.rb

@@ -299,11 +299,28 @@ describe Delayed::JobGroups::JobGroup do
   end
 
   describe "#cancel" do
+    subject(:job_group) do
+      create(
+        :job_group,
+        on_completion_job: on_completion_job,
+        on_completion_job_options: on_completion_job_options,
+        on_cancellation_job: on_cancellation_job,
+        on_cancellation_job_options: on_cancellation_job_options,
+        blocked: blocked
+      )
+    end
+
     let!(:queued_job) { Delayed::Job.create!(job_group_id: job_group.id) }
     let!(:running_job)  { Delayed::Job.create!(job_group_id: job_group.id, locked_at: Time.now, locked_by: 'test') }
+    let(:before_hook) {}
+    let(:on_cancellation_job) { 'dummy job' }
+    let(:on_cancellation_job_options) do
+      { foo: 'bar' }
+    end
+    let(:cancel) { true }
 
     before do
-      job_group.cancel
+      job_group.cancel if cancel
     end
 
     it "destroys the job group" do
@@ -317,6 +334,21 @@ describe Delayed::JobGroups::JobGroup do
     it "does not destroy running jobs" do
       expect(running_job).not_to have_been_destroyed
     end
+
+    context "when already cancelled" do
+      let(:cancel) { false }
+
+      it "skips cancel block if already cancelled" do
+        other = Delayed::JobGroups::JobGroup.find(job_group.id)
+        job_group.cancel
+
+        other.cancel
+        other.cancel
+
+        expect(Delayed::Job)
+          .to have_received(:enqueue).with(on_cancellation_job, on_cancellation_job_options).once
+      end
+    end
   end
 
   describe "#failure_cancels_group?" do

data/spec/spec_helper.rb

@@ -13,6 +13,11 @@ end
 
 require 'rspec/its'
 require 'database_cleaner'
+require 'delayed_job'
+
+Delayed::Worker.read_ahead = 1
+Delayed::Worker.destroy_failed_jobs = false
+
 require 'delayed_job_groups_plugin'
 require 'factory_bot'
 require 'yaml'
@@ -23,9 +28,6 @@ Dir["#{spec_dir}/support/**/*.rb"].sort.each { |f| require f }
 
 FileUtils.makedirs('log')
 
-Delayed::Worker.read_ahead = 1
-Delayed::Worker.destroy_failed_jobs = false
-
 Delayed::Worker.logger = Logger.new('log/test.log')
 Delayed::Worker.logger.level = Logger::DEBUG
 ActiveRecord::Base.logger = Delayed::Worker.logger

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_groups_plugin
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Joel Turkel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-09-25 00:00:00.000000000 Z
+date: 2025-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -269,6 +269,7 @@ files:
 - gemfiles/rails_8.0.gemfile
 - lib/delayed/job_groups/compatibility.rb
 - lib/delayed/job_groups/complete_stuck_job_groups_job.rb
+- lib/delayed/job_groups/errors.rb
 - lib/delayed/job_groups/job_extensions.rb
 - lib/delayed/job_groups/job_group.rb
 - lib/delayed/job_groups/plugin.rb