talentbox-delayed_job_sequel 4.2.1 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4302cd23662982c235f239ad688b7e625590bef5
-  data.tar.gz: 216726ccad71885a93664e0478d2f2719d0ae4f0
+  metadata.gz: b1852e994414af80378eb9b6dc43f5d0896f5efc
+  data.tar.gz: 5dea3af8a408fdaae2999522b58c39b2be0d59a8
 SHA512:
-  metadata.gz: f124eca09c6ed6276f61c89223cda8509fff8d39019b52b1faca646bd1469c4d649282e4de261f530c17f77e515dfbd37e1a48c70d425c30db2675d584f5490a
-  data.tar.gz: 24862b85887f74e7235ae1675f284ea69343840e2634204222c84eba8d9b4d82d677226485cc0eff388ee5b3ec53c8fd67c19689fd642015edf89a10d5caee26
+  metadata.gz: 1d4ece1d72b8cd5325918caa63a71cb06e69ace258c8a1da3ac04a06ba93833fd6748ea156cbe7f944f600aa602afd19d00b1d527821950369ec004f3d010feb
+  data.tar.gz: 728f1b030ff5a21aece61a2da07edb9ca1502301381f5c03465680c33f5fdd30ffdd354ac5b18d902ff02658c5d7a34b4cd17606460de343923d9ad63acb2f9d

data/README.md

@@ -51,6 +51,7 @@ Improvements has been made by those awesome contributors:
 * Phan Le
 * Tim Labeeuw
 * James Goodhouse (@jamesgoodhouse)
+* Lyle Franklin (@ljfranklin)
 
 ## How to contribute
 

data/lib/delayed/backend/sequel.rb

@@ -44,14 +44,28 @@ module Delayed
           filter(:locked_by => worker_name).update(:locked_by => nil, :locked_at => nil)
         end
 
+        # adapted from
+        # https://github.com/collectiveidea/delayed_job_active_record/blob/master/lib/delayed/backend/active_record.rb
         def self.reserve(worker, max_run_time = Worker.max_run_time)
           ds = ready_to_run(worker.name, max_run_time)
+
           ds = ds.filter(::Sequel.lit("priority >= ?", Worker.min_priority)) if Worker.min_priority
           ds = ds.filter(::Sequel.lit("priority <= ?", Worker.max_priority)) if Worker.max_priority
           ds = ds.filter(:queue => Worker.queues) if Worker.queues.any?
           ds = ds.by_priority
-          ds = ds.for_update
 
+          case ::Sequel::Model.db.database_type
+          when :mysql
+            lock_with_read_ahead(ds, worker)
+          else
+            lock_with_for_update(ds, worker)
+          end
+        end
+
+        # Lock a single job using SELECT ... FOR UPDATE.
+        # More performant but may cause deadlocks in some databases.
+        def self.lock_with_for_update(ds, worker)
+          ds = ds.for_update
           db.transaction do
             if job = ds.first
               job.locked_at = self.db_time_now
@@ -62,6 +76,15 @@ module Delayed
           end
         end
 
+        # Fetch up-to `worker.read_ahead` jobs, try to lock one at a time.
+        # This query is more conservative as it does not acquire any DB read locks.
+        def self.lock_with_read_ahead(ds, worker)
+          ds.limit(worker.read_ahead).detect do |job|
+            count = ds.where(id: job.id).update(locked_at: self.db_time_now, locked_by: worker.name)
+            count == 1 && job.reload
+          end
+        end
+
         # Get the current time (GMT or local depending on DB)
         # Note: This does not ping the DB to get the time, so all your clients
         # must have syncronized clocks.

data/spec/delayed/backend/sequel_spec.rb

@@ -14,20 +14,33 @@ describe Delayed::Backend::Sequel::Job do
 
   it "does not allow more than 1 worker to grab the same job" do
     expect do
-      10.times do
+      jobs_to_run = 200
+      workers_to_run = 20
+      jobs_per_worker = jobs_to_run/workers_to_run
+
+      jobs_to_run.times do
         described_class.create(payload_object: SimpleJob.new)
       end
 
-      20.times.map do |i|
+      workers_to_run.times.map do |i|
         Thread.new do
           worker = Delayed::Worker.new
           worker.name = "worker_#{i}"
-          worker.work_off(4)
+
+          # Ensure each worker performs the expected number of jobs as
+          # `work_off` will ocassionally perform less than the requested number
+          # if it is unable to lock a job within the `worker.read_ahead` limit
+          jobs_completed_by_this_worker = 0
+          while jobs_completed_by_this_worker < jobs_per_worker do
+            successes, failures = worker.work_off(jobs_per_worker - jobs_completed_by_this_worker)
+            expect(failures).to eq(0), "Expected zero failures, got #{failures}"
+            jobs_completed_by_this_worker += successes
+          end
         end
       end.map(&:join)
     end.not_to raise_error
 
-    expect(Delayed::Job.count).to be < 10
+    expect(Delayed::Job.count).to eql 0
   end
 
   context ".count" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: talentbox-delayed_job_sequel
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.2.2
 platform: ruby
 authors:
 - Jonathan Tron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-19 00:00:00.000000000 Z
+date: 2017-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Sequel backend for DelayedJob