inst-jobs 0.15.0 → 0.16.0

data/spec/active_record_job_spec.rb

@@ -36,7 +36,7 @@ describe 'Delayed::Backed::ActiveRecord::Job' do
     end
 
     it "should not allow a second worker to get exclusive access if failed to be processed by worker1 and run_at time is now in future (due to backing off behaviour)" do
-      @job.update_attributes(:attempts => 1, :run_at => 1.day.from_now)
+      @job.update(:attempts => 1, :run_at => 1.day.from_now)
       @job_copy_for_worker_2.send(:lock_exclusively!, 'worker2').should == false
     end
 
@@ -208,40 +208,6 @@ describe 'Delayed::Backed::ActiveRecord::Job' do
           job3.next_in_strand.should == true
         end
       end
-
-      it "should set multiple jobs as next_in_strand at once if needed" do
-        change_setting(Delayed::Settings, :num_strands, ->(strand_name) {
-          case strand_name
-          when "njobs"; 2
-          else nil
-          end
-        }) do
-          job1 = Delayed::Job.enqueue(SimpleJob.new, n_strand: ["njobs"])
-          job1.reload
-          job1.next_in_strand.should == true
-          job2 = Delayed::Job.enqueue(SimpleJob.new, n_strand: ["njobs"])
-          job2.reload
-          job2.next_in_strand.should == true
-
-          job3 = Delayed::Job.enqueue(SimpleJob.new, n_strand: ["njobs"])
-          job3.reload
-          job3.next_in_strand.should == false
-
-          # manually unset next_in_strand
-          Delayed::Job.where(:id => job2).update_all(:next_in_strand => false)
-          job2.reload
-          job2.next_in_strand.should == false
-
-          run_job(job1) # should update both jobs
-
-          job3.reload
-          job3.next_in_strand.should == true
-
-          job2.reload
-          job2.next_in_strand.should == true
-
-        end
-      end
     end
   end
 
@@ -288,4 +254,39 @@ describe 'Delayed::Backed::ActiveRecord::Job' do
     expect(locked_jobs['work_queue']).to eq jobs[1..2]
     jobs.map(&:reload).map(&:locked_by).should == ['worker1', 'work_queue', 'work_queue', nil, nil]
   end
+
+
+  it "should not find jobs scheduled for now when we have forced latency" do
+    job = create_job
+    Delayed::Job.get_and_lock_next_available('worker', forced_latency: 60.0).should be_nil
+    Delayed::Job.get_and_lock_next_available('worker').should eq job
+  end
+
+  context "non-transactional", non_transactional: true do
+    it "creates a stranded job in a single statement" do
+      skip "Requires Rails 5.2 or greater" unless Rails.version >= '5.2'
+
+      allow(Delayed::Job.connection).to receive(:prepared_statements).and_return(false)
+      allow(Delayed::Job.connection).to receive(:execute).with(be_include("pg_advisory_xact_lock"), anything).and_call_original.once
+      allow(Delayed::Job.connection).to receive(:insert).never
+      j = create_job(strand: "test1")
+      allow(Delayed::Job.connection).to receive(:execute).and_call_original
+      expect(Delayed::Job.find(j.id)).to eq j
+    end
+
+    it "creates a non-stranded job in a single statement" do
+      skip "Requires Rails 5.2 or greater" unless Rails.version >= '5.2'
+
+      allow(Delayed::Job.connection).to receive(:prepared_statements).and_return(false)
+      call_count = 0
+      allow(Delayed::Job.connection).to receive(:execute).and_wrap_original do |m, (arg1, arg2)|
+        call_count += 1
+        m.call(arg1, arg2)
+      end
+      allow(Delayed::Job.connection).to receive(:insert).never
+      j = create_job(strand: "test1")
+      expect(call_count).to eq 1
+      expect(Delayed::Job.find(j.id)).to eq j
+    end
+  end
 end

data/spec/delayed/server_spec.rb

@@ -4,8 +4,10 @@ require 'delayed/server'
 RSpec.describe Delayed::Server, sinatra: true do
   include Rack::Test::Methods
 
+  @update = false
+
   def app
-    described_class.new
+    described_class.new(update: @update)
   end
 
   def parsed_body
@@ -60,4 +62,44 @@ RSpec.describe Delayed::Server, sinatra: true do
       end
     end
   end
+
+  describe "post '/bulk_update'" do
+    let!(:job_1) { Delayed::Job.enqueue(SimpleJob.new, strand: 'strand-1') }
+    let!(:job_2) { Delayed::Job.enqueue(SimpleJob.new, strand: 'strand-2') }
+    let!(:job_3) { Delayed::Job.enqueue(SimpleJob.new, strand: 'strand-3') }
+
+    context 'with update enabled' do
+      before do
+        @update = true
+        post "/bulk_update", params=JSON.generate(action: 'destroy', ids: [job_1.id])
+      end
+
+      it 'must remove job_1' do
+        expect{ Delayed::Job.find(job_1.id) }.to raise_error(ActiveRecord::RecordNotFound)
+        expect(Delayed::Job.find(job_2.id)).to_not be_nil
+        expect(Delayed::Job.find(job_3.id)).to_not be_nil
+      end
+
+      it 'must return ok' do
+        expect(last_response.ok?).to be true
+      end
+    end
+
+    context 'with update disabled' do
+      before do
+        @update = false
+        post "/bulk_update", params=JSON.generate(action: 'destroy', ids: [job_1.id])
+      end
+
+      it 'must not remove job_1' do
+        expect(Delayed::Job.find(job_1.id)).to_not be_nil
+        expect(Delayed::Job.find(job_2.id)).to_not be_nil
+        expect(Delayed::Job.find(job_3.id)).to_not be_nil
+      end
+
+      it 'must return forbidden' do
+        expect(last_response.forbidden?).to be true
+      end
+    end
+  end
 end

data/spec/delayed/work_queue/parent_process/server_spec.rb

@@ -77,7 +77,7 @@ RSpec.describe Delayed::WorkQueue::ParentProcess::Server do
     subject.run_once
 
     allow(subject).to receive(:prefetch_owner).and_return('work_queue:X')
-    job_args = [["worker_name1"], "queue_name", 1, 2, prefetch: 4, prefetch_owner: 'work_queue:X']
+    job_args = [["worker_name1"], "queue_name", 1, 2, prefetch: 4, prefetch_owner: 'work_queue:X', forced_latency: 6.0]
     job2 = Delayed::Job.new(:tag => 'tag')
     job2.create_and_lock!('work_queue:X')
     job3 = Delayed::Job.new(:tag => 'tag')
@@ -87,9 +87,12 @@ RSpec.describe Delayed::WorkQueue::ParentProcess::Server do
     expect(Delayed::Job).to receive(:get_and_lock_next_available).once.with(*job_args).and_return(jobs)
     Marshal.dump(["worker_name1", worker_config], client)
     subject.run_once
+    expect(subject).to_not be_all_workers_idle
     expect(Marshal.load(client)).to eq(job)
+
     Marshal.dump(["worker_name1", worker_config], client)
     subject.run_once
+    expect(subject).to_not be_all_workers_idle
     expect(Marshal.load(client)).to eq(job2)
   end
 

data/spec/delayed/worker/consul_health_check_spec.rb

@@ -37,11 +37,11 @@ RSpec.describe Delayed::Worker::ConsulHealthCheck do
     end
 
 
-    it 'must supply a script style check' do
+    it 'must supply a args style check' do
       allow(response).to receive(:ok?).and_return(true)
       allow(agent_client).to receive(:register_service) { |service|
         check = service.checks.first
-        expect(check.script).to_not be_nil
+        expect(check.args).to_not be_nil
         response
       }
       health_check.start

data/spec/delayed/worker/health_check_spec.rb

@@ -55,12 +55,12 @@ RSpec.describe Delayed::Worker::HealthCheck do
 
       2.times { Delayed::Job.enqueue(SimpleJob.new, run_at: initial_run_at, max_attempts: 4) }
       @alive_job = Delayed::Job.first
-      @alive_job.update_attributes!({
+      @alive_job.update!({
         locked_by: 'alive',
         locked_at: initial_run_at
       })
       @dead_job = Delayed::Job.last
-      @dead_job.update_attributes!({
+      @dead_job.update!({
         locked_by: 'dead',
         locked_at: initial_run_at
       })

data/spec/delayed/worker_spec.rb

@@ -1,28 +1,75 @@
 require_relative "../spec_helper"
 
-module Delayed
-  describe Worker do
-    let(:worker_config) { {
-        queue: "test", min_priority: 1, max_priority: 2, stuff: "stuff",
-    }.freeze }
-    subject { described_class.new(worker_config.dup) }
-
-    describe "#perform" do
-      it "fires off an error callback when a job raises an exception" do
-        fired = false
-        Worker.lifecycle.before(:error) {|worker, exception| fired = true}
-        job = double(:last_error= => nil, attempts: 1, reschedule: nil)
-        subject.perform(job)
-        expect(fired).to be_truthy
-      end
+describe Delayed::Worker do
+  let(:worker_config) { {
+      queue: "test", min_priority: 1, max_priority: 2, stuff: "stuff",
+  }.freeze }
+  subject { described_class.new(worker_config.dup) }
+
+  after { Delayed::Worker.lifecycle.reset! }
+
+  describe "#perform" do
+    it "fires off an error callback when a job raises an exception" do
+      fired = false
+      Delayed::Worker.lifecycle.before(:error) {|worker, exception| fired = true}
+      job = double(:last_error= => nil, attempts: 1, reschedule: nil)
+      subject.perform(job)
+      expect(fired).to be_truthy
     end
 
-    describe "#run" do
-      it "passes extra config options through to the WorkQueue" do
-        expect(subject.work_queue).to receive(:get_and_lock_next_available).
-          with(subject.name, worker_config).and_return(nil)
-        subject.run
+    it "reloads" do
+      fakeApplication = double('Rails.application',
+          config: double('Rails.application.config',
+          cache_classes: false,
+          reload_classes_only_on_change: false
+        ),
+        reloader: double()
+      )
+
+      allow(Rails).to receive(:application).and_return(fakeApplication)
+      if Rails::VERSION::MAJOR >= 5
+        expect(Rails.application.reloader).to receive(:reload!).once
+      else
+        expect(ActionDispatch::Reloader).to receive(:prepare!).once
+        expect(ActionDispatch::Reloader).to receive(:cleanup!).once
       end
+      job = double(:last_error= => nil, attempts: 0, reschedule: nil, expired?: false)
+      subject.perform(job)
+    end
+  end
+
+  describe "#log_job" do
+    around(:each) do |block|
+      prev_logger = Delayed::Settings.job_detailed_log_format
+      block.call
+      Delayed::Settings.job_detailed_log_format = prev_logger
+    end
+
+    it "has a reasonable default format" do
+      payload = double(perform: nil)
+      job = Delayed::Job.new(payload_object: payload, priority: 25, strand: "test_jobs")
+      short_log_format = subject.log_job(job, :short)
+      expect(short_log_format).to eq("RSpec::Mocks::Double")
+      long_format = subject.log_job(job, :long)
+      expect(long_format).to eq("RSpec::Mocks::Double {\"priority\":25,\"attempts\":0,\"created_at\":null,\"tag\":\"RSpec::Mocks::Double#perform\",\"max_attempts\":null,\"strand\":\"test_jobs\",\"source\":null}")
+    end
+
+    it "logging format can be changed with settings" do
+      Delayed::Settings.job_detailed_log_format = ->(job){ "override format #{job.strand}"}
+      payload = double(perform: nil)
+      job = Delayed::Job.new(payload_object: payload, priority: 25, strand: "test_jobs")
+      short_log_format = subject.log_job(job, :short)
+      expect(short_log_format).to eq("RSpec::Mocks::Double")
+      long_format = subject.log_job(job, :long)
+      expect(long_format).to eq("RSpec::Mocks::Double override format test_jobs")
+    end
+  end
+
+  describe "#run" do
+    it "passes extra config options through to the WorkQueue" do
+      expect(subject.work_queue).to receive(:get_and_lock_next_available).
+        with(subject.name, worker_config).and_return(nil)
+      subject.run
     end
   end
 end

data/spec/gemfiles/52.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gemspec :path=>"../../"
+
+gem "rails", "~> 5.2.0"
+gem 'sinatra', "2.0.0.beta2"
+gem 'sinatra-contrib', "2.0.0.beta2"

data/spec/gemfiles/60.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gemspec :path=>"../../"
+
+gem "rails", "~> 6.0.0"
+gem 'sinatra', "2.0.0.beta2"
+gem 'sinatra-contrib', "2.0.0.beta2"

data/spec/shared/delayed_batch.rb

@@ -81,5 +81,16 @@ shared_examples_for 'Delayed::Batch' do
       Delayed::Job.find_available(1).first.tag.should == "String#size"
       Delayed::Job.find_available(1).first.priority.should == 11
     end
+
+    it "should list a job only once when the same call is made multiple times" do
+      Delayed::Batch.serial_batch(:priority => 11) {
+        "string".send_later_enqueue_args(:size, no_delay: true)
+        "string".send_later_enqueue_args(:gsub, { no_delay: true }, /./, "!")
+        "string".send_later_enqueue_args(:size, no_delay: true)
+      }
+      batch_job = Delayed::Job.find_available(1).first
+      jobs = batch_job.payload_object.jobs
+      jobs.size.should == 2
+    end
   end
 end

data/spec/shared/shared_backend.rb

@@ -369,6 +369,21 @@ shared_examples_for 'a backend' do
         job3.should == job1
         job3.run_at.to_i.should == t2.to_i
       end
+
+      it "should update existing singleton job handler if requested" do
+        job1 = Delayed::Job.enqueue(SimpleJob.new, { :queue => nil, :singleton => 'myjobs', :on_conflict => :overwrite})
+        job2 = Delayed::Job.enqueue(ErrorJob.new, { :queue => nil, :singleton => 'myjobs', :on_conflict => :overwrite})
+        job2.should == job1
+        expect(job2.handler).to include("ErrorJob")
+      end
+
+      it "does not create even if it's earlier when in loose mode" do
+        t1 = 1.hour.from_now
+        job1 = create_job(singleton: 'myjobs', run_at: t1)
+        job2 = create_job(singleton: 'myjobs', on_conflict: :loose)
+        job1.should == job2
+        job2.run_at.to_i.should == t1.to_i
+      end
     end
   end
 

data/spec/shared/worker.rb

@@ -13,6 +13,10 @@ shared_examples_for 'Delayed::Worker' do
     Delayed::Settings.sleep_delay = ->{ 0.01 }
   end
 
+  after do
+    Delayed::Settings.sleep_delay = 2.0
+  end
+
   describe "running a job" do
     it "should not fail when running a job with a % in the name" do
       @job = "Some % Name here".send_later_enqueue_args(:starts_with?, { no_delay: true }, "Some % Name")

data/spec/spec_helper.rb

@@ -23,7 +23,8 @@ RSpec.configure do |config|
     if Delayed::Backend::Redis::Job.redis
       Delayed::Backend::Redis::Job.redis.flushdb
     end
-    DatabaseCleaner.strategy = (example.metadata[:sinatra] ? :truncation : :transaction)
+    DatabaseCleaner.strategy = (example.metadata[:sinatra] || example.metadata[:non_transactional]) ?
+        :truncation : :transaction
     DatabaseCleaner.start
   end
 
@@ -59,6 +60,8 @@ end
 def migrate(file)
   if ::Rails.version < '5.2'
     ActiveRecord::Migrator.migrate(file)
+  elsif ::Rails.version >= '6'
+    ActiveRecord::MigrationContext.new(file, ActiveRecord::SchemaMigration).migrate
   else
     ActiveRecord::MigrationContext.new(file).migrate
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Tobias Luetke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-07 00:00:00.000000000 Z
+date: 2020-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -102,25 +102,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: rufus-scheduler
+  name: fugit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: bump
   requirement: !ruby/object:Gem::Requirement
@@ -169,14 +163,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -251,16 +245,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -309,14 +303,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 description: 
 email:
 - brianp@instructure.com
@@ -346,6 +340,11 @@ files:
 - db/migrate/20151123210429_add_expires_at_to_jobs.rb
 - db/migrate/20151210162949_improve_max_concurrent.rb
 - db/migrate/20161206323555_add_back_default_string_limits_jobs.rb
+- db/migrate/20181217155351_speed_up_max_concurrent_triggers.rb
+- db/migrate/20190726154743_make_critical_columns_not_null.rb
+- db/migrate/20200330230722_add_id_to_get_delayed_jobs_index.rb
+- db/migrate/20200824222232_speed_up_max_concurrent_delete_trigger.rb
+- db/migrate/20200825011002_add_strand_order_override.rb
 - exe/inst_jobs
 - lib/delayed/backend/active_record.rb
 - lib/delayed/backend/base.rb
@@ -407,11 +406,10 @@ files:
 - spec/delayed/worker/health_check_spec.rb
 - spec/delayed/worker_spec.rb
 - spec/gemfiles/42.gemfile
-- spec/gemfiles/42.gemfile.lock
 - spec/gemfiles/50.gemfile
-- spec/gemfiles/50.gemfile.lock
 - spec/gemfiles/51.gemfile
-- spec/gemfiles/51.gemfile.lock
+- spec/gemfiles/52.gemfile
+- spec/gemfiles/60.gemfile
 - spec/migrate/20140924140513_add_story_table.rb
 - spec/redis_job_spec.rb
 - spec/sample_jobs.rb
@@ -441,8 +439,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Instructure-maintained fork of delayed_job
@@ -450,10 +447,9 @@ test_files:
 - spec/sample_jobs.rb
 - spec/spec_helper.rb
 - spec/redis_job_spec.rb
-- spec/gemfiles/51.gemfile.lock
-- spec/gemfiles/42.gemfile.lock
-- spec/gemfiles/50.gemfile.lock
+- spec/gemfiles/60.gemfile
 - spec/gemfiles/42.gemfile
+- spec/gemfiles/52.gemfile
 - spec/gemfiles/50.gemfile
 - spec/gemfiles/51.gemfile
 - spec/shared_jobs_specs.rb