inst-jobs 2.4.3 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a5cde929174dd49e07d06025310bcea4cb0a6b55b3d83a40ea7b7bde9c9b775
-  data.tar.gz: 1028828aa017afc111c89f410425a58939c42697066279b7a22174463384d1f1
+  metadata.gz: 90e78e46299d111959e7e48f25fe4e05a7939c6fb54fcd423deff4b960e79e6c
+  data.tar.gz: 20963910cd2cb1856f73cabbdc1547131a0d5096e26f7cc444f0a6e7d26b0ded
 SHA512:
-  metadata.gz: ba08cb3d2e9ff3a72bdaf8c47d9265cc21a7bfd401b1657349c12043852955ac3c7e02d52c1ef1ab602207cbcc35e48e7293c77fceb34f12aec660d9e9638a7f
-  data.tar.gz: d86f8ead17b6ddc679350dc9b9e5ee52a2ffc5b8ad62be52e5f375a28e0ccd9b9a1a6aad5255e08273a26fa9ed0d90a31afd618caee5e0378adf5481494bdc78
+  metadata.gz: 22155dba3fd9f1201e67930be8a3cc488da21b02b2066b59fe9a0f28f5670393534ddbb87a937979df356ba602c23a27e97f7650463fa2eb7c53e76647df5f02
+  data.tar.gz: 41a6bec7f263657aac33b62eeb8169db1898dfdcdbfadc32d91a985f54cb037a5691d75f02dff80b9c80ea57387a746fa70e6710545fe6b9c12724dde9f8f720

data/db/migrate/20210917232626_add_delete_conflicting_singletons_before_unlock_trigger.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class AddDeleteConflictingSingletonsBeforeUnlockTrigger < ActiveRecord::Migration[5.2]
+  def up
+    execute(<<~SQL)
+      CREATE FUNCTION delayed_jobs_before_unlock_delete_conflicting_singletons_row_fn () RETURNS trigger AS $$
+      BEGIN
+        IF EXISTS (SELECT 1 FROM delayed_jobs j2 WHERE j2.singleton=OLD.singleton) THEN
+          DELETE FROM delayed_jobs WHERE id<>OLD.id AND singleton=OLD.singleton;
+        END IF;
+        RETURN NEW;
+      END;
+      $$ LANGUAGE plpgsql;
+    SQL
+    execute(<<~SQL)
+      CREATE TRIGGER delayed_jobs_before_unlock_delete_conflicting_singletons_row_tr BEFORE UPDATE ON delayed_jobs FOR EACH ROW WHEN (
+        OLD.singleton IS NOT NULL AND
+        OLD.singleton=NEW.singleton AND
+        OLD.locked_by IS NOT NULL AND
+        NEW.locked_by IS NULL) EXECUTE PROCEDURE delayed_jobs_before_unlock_delete_conflicting_singletons_row_fn();
+    SQL
+  end
+
+  def down
+    execute("DROP FUNCTION delayed_jobs_before_unlock_delete_conflicting_singletons_row_tr_fn()")
+  end
+end

data/lib/delayed/backend/active_record.rb

@@ -98,11 +98,11 @@ module Delayed
               fn_name = connection.quote_table_name("half_md5_as_bigint")
               sql = "SELECT pg_advisory_xact_lock(#{fn_name}(#{connection.quote(values['strand'])})); #{sql}"
             end
-            result = connection.execute(sql, "#{self} Create")
+            result = connection.execute(sql, "#{self.class} Create")
             self.id = result.values.first&.first
             result.clear
           else
-            result = connection.exec_query(sql, "#{self} Create", binds)
+            result = connection.exec_query(sql, "#{self.class} Create", binds)
             self.id = connection.send(:last_inserted_id, result)
           end
 

data/lib/delayed/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Delayed
-  VERSION = "2.4.3"
+  VERSION = "2.4.4"
 end

data/spec/shared/shared_backend.rb

@@ -491,6 +491,19 @@ shared_examples_for "a backend" do
           expect(@job2).to be_new_record
         end
       end
+
+      context "when unlocking with another singleton pending" do
+        it "deletes the pending singleton" do
+          @job1 = create_job(singleton: "myjobs", max_attempts: 2)
+          expect(Delayed::Job.get_and_lock_next_available("w1")).to eq(@job1)
+
+          @job2 = create_job(singleton: "myjobs", max_attempts: 2)
+
+          @job1.reload.reschedule
+          expect { @job1.reload }.not_to raise_error
+          expect { @job2.reload }.to raise_error(ActiveRecord::RecordNotFound)
+        end
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ require "delayed_job"
 require "delayed/testing"
 
 require "database_cleaner"
+require "fileutils"
 require "rack/test"
 require "timecop"
 require "webmock/rspec"
@@ -80,7 +81,8 @@ Delayed::Backend::ActiveRecord::Job.reset_column_information
 Delayed::Backend::ActiveRecord::Job::Failed.reset_column_information
 
 Time.zone = "UTC" # rubocop:disable Rails/TimeZoneAssignment
-Rails.logger = Logger.new(nil)
+FileUtils.mkdir_p("tmp")
+ActiveRecord::Base.logger = Rails.logger = Logger.new("tmp/test.log")
 
 # Purely useful for test cases...
 class Story < ActiveRecord::Base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.4
 platform: ruby
 authors:
 - Tobias Luetke
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-17 00:00:00.000000000 Z
+date: 2021-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -431,6 +431,7 @@ files:
 - db/migrate/20200825011002_add_strand_order_override.rb
 - db/migrate/20210809145804_add_n_strand_index.rb
 - db/migrate/20210812210128_add_singleton_column.rb
+- db/migrate/20210917232626_add_delete_conflicting_singletons_before_unlock_trigger.rb
 - exe/inst_jobs
 - lib/delayed/backend/active_record.rb
 - lib/delayed/backend/base.rb
@@ -511,7 +512,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
+rubygems_version: 3.2.24
 signing_key:
 specification_version: 4
 summary: Instructure-maintained fork of delayed_job