canvas-jobs 0.9.16 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57643efbeabb15ec7af78f3150afd1852462c4e0
-  data.tar.gz: 70ada31da936583af18e042eee3e68080725703f
+  metadata.gz: f7bf248a7914d0c5dbf6c0aafd1ecae8cb320734
+  data.tar.gz: 96d5f165dbba5d4390876d9d2770de2c72e3fd0f
 SHA512:
-  metadata.gz: c2b9ad3960cbd1b008e31b5e2c28375277a27366a2df2e5682f334eb85d2a179a3e68885e4cba7ed44ebc3366bb039c76f1e99105e625d877208d5f309ed7cbf
-  data.tar.gz: 238773d9623aaeb6c567ffdd87033e5574cc5a39cb07a891c4721c70b85359b25b8844352aa48355678287b7d747d07d1efc9b007436cecde99f9902d3825da3
+  metadata.gz: 957b4893c64372f6930c9311c3ce0a4f94dd87339d09e680b995be6098fa73271b158db5871d4f6e57d9718d51f0dd81052be81ad08e6e220c86c509e18a0348
+  data.tar.gz: a819d0f1218927de1fd18569d7bce5ff5659d9a57666104bd66937fbfa2f556661c333a8d66d4179ff26b45c6259e32d50ac35a8c818cfb05051d976da3ed0b9

data/db/migrate/20150807133223_add_max_concurrent_to_jobs.rb

@@ -0,0 +1,70 @@
+class AddMaxConcurrentToJobs < ActiveRecord::Migration
+  def connection
+    Delayed::Job.connection
+  end
+
+  def up
+    add_column :delayed_jobs, :max_concurrent, :integer, :default => 1, :null => false
+
+    if connection.adapter_name == 'PostgreSQL'
+      execute(<<-CODE)
+      CREATE OR REPLACE FUNCTION delayed_jobs_before_insert_row_tr_fn () RETURNS trigger AS $$
+      BEGIN
+        IF NEW.strand IS NOT NULL THEN
+          PERFORM pg_advisory_xact_lock(half_md5_as_bigint(NEW.strand));
+          IF (SELECT COUNT(*) FROM delayed_jobs WHERE strand = NEW.strand) >= NEW.max_concurrent THEN
+            NEW.next_in_strand := 'f';
+          END IF;
+        END IF;
+        RETURN NEW;
+      END;
+      $$ LANGUAGE plpgsql;
+      CODE
+
+      execute(<<-CODE)
+      CREATE OR REPLACE FUNCTION delayed_jobs_after_delete_row_tr_fn () RETURNS trigger AS $$
+      BEGIN
+        IF OLD.strand IS NOT NULL THEN
+          PERFORM pg_advisory_xact_lock(half_md5_as_bigint(OLD.strand));
+          IF (SELECT COUNT(*) FROM delayed_jobs WHERE strand = OLD.strand AND next_in_strand = 't') < OLD.max_concurrent THEN
+            UPDATE delayed_jobs SET next_in_strand = 't' WHERE id = (
+              SELECT id FROM delayed_jobs j2 WHERE next_in_strand = 'f' AND
+              j2.strand = OLD.strand ORDER BY j2.id ASC LIMIT 1 FOR UPDATE
+            );
+          END IF;
+        END IF;
+        RETURN OLD;
+      END;
+      $$ LANGUAGE plpgsql;
+      CODE
+    end
+  end
+
+  def down
+    remove_column :delayed_jobs, :max_concurrent
+
+    if connection.adapter_name == 'PostgreSQL'
+      execute(<<-CODE)
+      CREATE OR REPLACE FUNCTION delayed_jobs_before_insert_row_tr_fn () RETURNS trigger AS $$
+      BEGIN
+        PERFORM pg_advisory_xact_lock(half_md5_as_bigint(NEW.strand));
+        IF (SELECT 1 FROM delayed_jobs WHERE strand = NEW.strand LIMIT 1) = 1 THEN
+          NEW.next_in_strand := 'f';
+        END IF;
+        RETURN NEW;
+      END;
+      $$ LANGUAGE plpgsql;
+      CODE
+
+      execute(<<-CODE)
+      CREATE OR REPLACE FUNCTION delayed_jobs_after_delete_row_tr_fn () RETURNS trigger AS $$
+      BEGIN
+        PERFORM pg_advisory_xact_lock(half_md5_as_bigint(OLD.strand));
+        UPDATE delayed_jobs SET next_in_strand = 't' WHERE id = (SELECT id FROM delayed_jobs j2 WHERE j2.strand = OLD.strand ORDER BY j2.strand, j2.id ASC LIMIT 1 FOR UPDATE);
+        RETURN OLD;
+      END;
+      $$ LANGUAGE plpgsql;
+      CODE
+    end
+  end
+end

data/lib/delayed/backend/active_record.rb

@@ -43,6 +43,13 @@ module Delayed
           end
         end
 
+        # This overwrites the previous behavior
+        # so rather than changing the strand and balancing at queue time,
+        # this keeps the strand intact and uses triggers to limit the number running
+        def self.n_strand_options(strand_name, num_strands)
+          {:strand => strand_name, :max_concurrent => num_strands}
+        end
+
         def self.current
           where("run_at<=?", db_time_now)
         end
@@ -298,6 +305,7 @@ module Delayed
           attrs['original_job_id'] = attrs.delete('id')
           attrs['failed_at'] ||= self.class.db_time_now
           attrs.delete('next_in_strand')
+          attrs.delete('max_concurrent')
           self.class.transaction do
             failed_job = Failed.create(attrs)
             self.destroy

data/lib/delayed/backend/base.rb

@@ -59,9 +59,7 @@ module Delayed
             num_strands ||= Delayed::Settings.num_strands.call(strand_name)
             num_strands = num_strands ? num_strands.to_i : 1
 
-            strand_num = num_strands > 1 ? rand(num_strands) + 1 : 1
-            full_strand_name += ":#{strand_num}" if strand_num > 1
-            options[:strand] = full_strand_name
+            options.merge!(n_strand_options(full_strand_name, num_strands))
           end
 
           if options[:singleton]
@@ -80,6 +78,15 @@ module Delayed
           job
         end
 
+        # by default creates a new strand name randomly based on num_strands
+        # effectively balancing the load during queueing
+        # overwritten in ActiveRecord::Job to use triggers to balance at run time
+        def n_strand_options(strand_name, num_strands)
+          strand_num = num_strands > 1 ? rand(num_strands) + 1 : 1
+          strand_name += ":#{strand_num}" if strand_num > 1
+          {:strand => strand_name}
+        end
+
         def in_delayed_job?
           !!Thread.current[:in_delayed_job]
         end

data/lib/delayed/pool.rb

@@ -201,7 +201,7 @@ class Pool
   def join
     loop do
       child = Process.wait
-      if child
+      if workers.include?(child)
         worker = workers.delete(child)
         if worker.is_a?(Symbol)
           say "ran auditor: #{worker}"

data/lib/delayed/version.rb

@@ -1,3 +1,3 @@
 module Delayed
-  VERSION = "0.9.16"
+  VERSION = "0.10.0"
 end

data/spec/active_record_job_spec.rb

@@ -68,7 +68,6 @@ describe 'Delayed::Backed::ActiveRecord::Job' do
     job.locked_at.should == nil
   end
 
-
   describe "bulk_update failed jobs" do
     before do
       @flavor = 'failed'
@@ -101,4 +100,107 @@ describe 'Delayed::Backed::ActiveRecord::Job' do
     end
   end
 
+  context 'n_strand' do
+    it "should default to 1" do
+      expect(Delayed::Job).to receive(:rand).never
+      job = Delayed::Job.enqueue(SimpleJob.new, :n_strand => 'njobs')
+      job.strand.should == "njobs"
+    end
+
+    it "should set max_concurrent based on num_strands" do
+      change_setting(Delayed::Settings, :num_strands, ->(strand_name) { expect(strand_name).to eql "njobs"; "3" }) do
+        job = Delayed::Job.enqueue(SimpleJob.new, :n_strand => 'njobs')
+        job.strand.should == "njobs"
+        job.max_concurrent.should == 3
+      end
+    end
+
+    context "with two parameters" do
+      it "should use the first param as the setting to read" do
+        job = Delayed::Job.enqueue(SimpleJob.new, n_strand: ["njobs", "123"])
+        job.strand.should == "njobs/123"
+        change_setting(Delayed::Settings, :num_strands, ->(strand_name) {
+          case strand_name
+          when "njobs"; 3
+          else nil
+          end
+        }) do
+          job = Delayed::Job.enqueue(SimpleJob.new, n_strand: ["njobs", "123"])
+          job.strand.should == "njobs/123"
+          job.max_concurrent.should == 3
+        end
+      end
+
+      it "should allow overridding the setting based on the second param" do
+        change_setting(Delayed::Settings, :num_strands, ->(strand_name) {
+          case strand_name
+          when "njobs/123"; 5
+          else nil
+          end
+        }) do
+          job = Delayed::Job.enqueue(SimpleJob.new, n_strand: ["njobs", "123"])
+          job.strand.should == "njobs/123"
+          job.max_concurrent.should == 5
+          job = Delayed::Job.enqueue(SimpleJob.new, n_strand: ["njobs", "456"])
+          job.strand.should == "njobs/456"
+          job.max_concurrent.should == 1
+        end
+
+        change_setting(Delayed::Settings, :num_strands, ->(strand_name) {
+          case strand_name
+          when "njobs/123"; 5
+          when "njobs"; 3
+          else nil
+          end
+        }) do
+          job = Delayed::Job.enqueue(SimpleJob.new, n_strand: ["njobs", "123"])
+          job.strand.should == "njobs/123"
+          job.max_concurrent.should == 5
+          job = Delayed::Job.enqueue(SimpleJob.new, n_strand: ["njobs", "456"])
+          job.strand.should == "njobs/456"
+          job.max_concurrent.should == 3
+        end
+      end
+    end
+
+    context "max_concurrent triggers" do
+      before do
+        skip("postgres specific") unless ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
+      end
+
+      it "should set one job as next_in_strand at a time with max_concurrent of 1" 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 == false
+        run_job(job1)
+        job2.reload
+        job2.next_in_strand.should == true
+      end
+
+      it "should run set multiple jobs as next_in_strand at a time based on max_concurrent" 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
+          run_job(job1)
+          job3.reload
+          job3.next_in_strand.should == true
+        end
+      end
+    end
+  end
 end

data/spec/gemfiles/32.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    canvas-jobs (0.9.15)
+    canvas-jobs (0.9.14)
       after_transaction_commit (= 1.0.1)
       rails (>= 3.2)
       redis (> 3.0)
@@ -11,12 +11,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.19)
-      actionpack (= 3.2.19)
+    actionmailer (3.2.22)
+      actionpack (= 3.2.22)
       mail (~> 2.5.4)
-    actionpack (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
+    actionpack (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -24,72 +24,72 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.19)
-      activesupport (= 3.2.19)
+    activemodel (3.2.22)
+      activesupport (= 3.2.22)
       builder (~> 3.0.0)
-    activerecord (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
+    activerecord (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
-    activesupport (3.2.19)
+    activeresource (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
+    activesupport (3.2.22)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     after_transaction_commit (1.0.1)
       activerecord (>= 3.2)
     arel (3.0.3)
     backports (3.6.6)
-    builder (3.0.0)
-    bump (0.5.0)
+    builder (3.0.4)
+    bump (0.5.2)
     coderay (1.1.0)
     database_cleaner (1.3.0)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     hike (1.2.3)
-    i18n (0.6.11)
+    i18n (0.7.0)
     journey (1.0.4)
-    json (1.8.1)
+    json (1.8.3)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     method_source (0.8.2)
     mime-types (1.25.1)
-    multi_json (1.10.1)
-    pg (0.17.1)
+    multi_json (1.11.2)
+    pg (0.18.2)
     polyglot (0.3.5)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.4.5)
+    rack (1.4.7)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-protection (1.5.3)
       rack
     rack-ssl (1.3.4)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.2.19)
-      actionmailer (= 3.2.19)
-      actionpack (= 3.2.19)
-      activerecord (= 3.2.19)
-      activeresource (= 3.2.19)
-      activesupport (= 3.2.19)
+    rails (3.2.22)
+      actionmailer (= 3.2.22)
+      actionpack (= 3.2.22)
+      activerecord (= 3.2.22)
+      activeresource (= 3.2.22)
+      activesupport (= 3.2.22)
       bundler (~> 1.0)
-      railties (= 3.2.19)
-    railties (3.2.19)
-      actionpack (= 3.2.19)
-      activesupport (= 3.2.19)
+      railties (= 3.2.22)
+    railties (3.2.22)
+      actionpack (= 3.2.22)
+      activesupport (= 3.2.22)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.3.2)
-    rdoc (3.12)
+    rake (10.4.2)
+    rdoc (3.12.2)
       json (~> 1.4)
     redis (3.2.1)
     redis-scripting (1.0.1)
@@ -106,7 +106,7 @@ GEM
     rspec-mocks (3.1.3)
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
-    rufus-scheduler (3.1.7)
+    rufus-scheduler (3.1.3)
     sinatra (1.4.6)
       rack (~> 1.4)
       rack-protection (~> 1.4)
@@ -119,12 +119,11 @@ GEM
       sinatra (~> 1.4.0)
       tilt (>= 1.3, < 3)
     slop (3.6.0)
-    sprockets (2.2.2)
+    sprockets (2.2.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    syck (1.0.5)
     test_after_commit (0.4.1)
       activerecord (>= 3.2)
     thor (0.19.1)
@@ -133,8 +132,8 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.39)
-    wwtd (1.1.1)
+    tzinfo (0.3.44)
+    wwtd (0.7.0)
 
 PLATFORMS
   ruby
@@ -151,7 +150,6 @@ DEPENDENCIES
   rspec (= 3.1.0)
   sinatra
   sinatra-contrib
-  syck (>= 1.0.4)
   test_after_commit (= 0.4.1)
   timecop (= 0.7.1)
-  wwtd (~> 1.1.1)
+  wwtd (= 0.7.0)

data/spec/redis_job_spec.rb

@@ -74,4 +74,67 @@ describe 'Delayed::Backend::Redis::Job' do
       Delayed::Job.jobs_count(:current) == before_count + 1
     end
   end
+
+  context 'n_strand' do
+    it "should default to 1" do
+      expect(Delayed::Job).to receive(:rand).never
+      job = Delayed::Job.enqueue(SimpleJob.new, :n_strand => 'njobs')
+      job.strand.should == "njobs"
+    end
+
+    it "should pick a strand randomly out of N" do
+      change_setting(Delayed::Settings, :num_strands, ->(strand_name) { expect(strand_name).to eql "njobs"; "3" }) do
+        expect(Delayed::Job).to receive(:rand).with(3).and_return(1)
+        job = Delayed::Job.enqueue(SimpleJob.new, :n_strand => 'njobs')
+        job.strand.should == "njobs:2"
+      end
+    end
+
+    context "with two parameters" do
+      it "should use the first param as the setting to read" do
+        job = Delayed::Job.enqueue(SimpleJob.new, n_strand: ["njobs", "123"])
+        job.strand.should == "njobs/123"
+        change_setting(Delayed::Settings, :num_strands, ->(strand_name) {
+          case strand_name
+          when "njobs"; 3
+          else nil
+          end
+        }) do
+          expect(Delayed::Job).to receive(:rand).with(3).and_return(1)
+          job = Delayed::Job.enqueue(SimpleJob.new, n_strand: ["njobs", "123"])
+          job.strand.should == "njobs/123:2"
+        end
+      end
+
+      it "should allow overridding the setting based on the second param" do
+        change_setting(Delayed::Settings, :num_strands, ->(strand_name) {
+          case strand_name
+          when "njobs/123"; 5
+          else nil
+          end
+        }) do
+          expect(Delayed::Job).to receive(:rand).with(5).and_return(3)
+          job = Delayed::Job.enqueue(SimpleJob.new, n_strand: ["njobs", "123"])
+          job.strand.should == "njobs/123:4"
+          job = Delayed::Job.enqueue(SimpleJob.new, n_strand: ["njobs", "456"])
+          job.strand.should == "njobs/456"
+        end
+
+        change_setting(Delayed::Settings, :num_strands, ->(strand_name) {
+          case strand_name
+          when "njobs/123"; 5
+          when "njobs"; 3
+          else nil
+          end
+        }) do
+          expect(Delayed::Job).to receive(:rand).with(5).and_return(2)
+          expect(Delayed::Job).to receive(:rand).with(3).and_return(1)
+          job = Delayed::Job.enqueue(SimpleJob.new, n_strand: ["njobs", "123"])
+          job.strand.should == "njobs/123:3"
+          job = Delayed::Job.enqueue(SimpleJob.new, n_strand: ["njobs", "456"])
+          job.strand.should == "njobs/456:2"
+        end
+      end
+    end
+  end
 end

data/spec/shared/shared_backend.rb

@@ -76,14 +76,14 @@ shared_examples_for 'a backend' do
     job = Delayed::Job.new :handler => "--- !ruby/struct:Delayed::JobThatDoesNotExist {}"
     lambda { job.payload_object.perform }.should raise_error(Delayed::Backend::DeserializationError)
   end
-  
+
   describe "find_available" do
     it "should not find failed jobs" do
       @job = create_job :attempts => 50
       @job.fail!
       Delayed::Job.find_available(5).should_not include(@job)
     end
-    
+
     it "should not find jobs scheduled for the future" do
       @job = create_job :run_at => (Delayed::Job.db_time_now + 1.minute)
       Delayed::Job.find_available(5).should_not include(@job)
@@ -94,13 +94,13 @@ shared_examples_for 'a backend' do
       Delayed::Job.get_and_lock_next_available('other_worker').should == @job
       Delayed::Job.find_available(5).should_not include(@job)
     end
-    
+
     it "should find open jobs" do
       @job = create_job
       Delayed::Job.find_available(5).should include(@job)
     end
   end
-  
+
   context "when another worker is already performing an task, it" do
 
     before :each do
@@ -132,13 +132,13 @@ shared_examples_for 'a backend' do
       @job.name.should == 'Story#save'
     end
   end
-  
+
   context "worker prioritization" do
     it "should fetch jobs ordered by priority" do
       10.times { create_job :priority => rand(10) }
       jobs = Delayed::Job.find_available(10)
       jobs.size.should == 10
-      jobs.each_cons(2) do |a, b| 
+      jobs.each_cons(2) do |a, b|
         a.priority.should <= b.priority
       end
     end
@@ -167,23 +167,23 @@ shared_examples_for 'a backend' do
       found.should == job3
     end
   end
-  
+
   context "clear_locks!" do
     before do
       @job = create_job(:locked_by => 'worker', :locked_at => Delayed::Job.db_time_now)
     end
-    
+
     it "should clear locks for the given worker" do
       Delayed::Job.clear_locks!('worker')
       Delayed::Job.find_available(5).should include(@job)
     end
-    
+
     it "should not clear locks for other workers" do
       Delayed::Job.clear_locks!('worker1')
       Delayed::Job.find_available(5).should_not include(@job)
     end
   end
-  
+
   context "unlock" do
     before do
       @job = create_job(:locked_by => 'worker', :locked_at => Delayed::Job.db_time_now)
@@ -324,69 +324,6 @@ shared_examples_for 'a backend' do
         Delayed::Job.get_and_lock_next_available('w1').should == job1
       end
     end
-
-    context 'n_strand' do
-      it "should default to 1" do
-        expect(Delayed::Job).to receive(:rand).never
-        job = Delayed::Job.enqueue(SimpleJob.new, :n_strand => 'njobs')
-        job.strand.should == "njobs"
-      end
-
-      it "should pick a strand randomly out of N" do
-        change_setting(Delayed::Settings, :num_strands, ->(strand_name) { expect(strand_name).to eql "njobs"; "3" }) do
-          expect(Delayed::Job).to receive(:rand).with(3).and_return(1)
-          job = Delayed::Job.enqueue(SimpleJob.new, :n_strand => 'njobs')
-          job.strand.should == "njobs:2"
-        end
-      end
-
-      context "with two parameters" do
-        it "should use the first param as the setting to read" do
-          job = Delayed::Job.enqueue(SimpleJob.new, n_strand: ["njobs", "123"])
-          job.strand.should == "njobs/123"
-          change_setting(Delayed::Settings, :num_strands, ->(strand_name) {
-            case strand_name
-            when "njobs"; 3
-            else nil
-            end
-          }) do
-            expect(Delayed::Job).to receive(:rand).with(3).and_return(1)
-            job = Delayed::Job.enqueue(SimpleJob.new, n_strand: ["njobs", "123"])
-            job.strand.should == "njobs/123:2"
-          end
-        end
-
-        it "should allow overridding the setting based on the second param" do
-          change_setting(Delayed::Settings, :num_strands, ->(strand_name) {
-            case strand_name
-            when "njobs/123"; 5
-            else nil
-            end
-          }) do
-            expect(Delayed::Job).to receive(:rand).with(5).and_return(3)
-            job = Delayed::Job.enqueue(SimpleJob.new, n_strand: ["njobs", "123"])
-            job.strand.should == "njobs/123:4"
-            job = Delayed::Job.enqueue(SimpleJob.new, n_strand: ["njobs", "456"])
-            job.strand.should == "njobs/456"
-          end
-
-          change_setting(Delayed::Settings, :num_strands, ->(strand_name) {
-            case strand_name
-            when "njobs/123"; 5
-            when "njobs"; 3
-            else nil
-            end
-          }) do
-            expect(Delayed::Job).to receive(:rand).with(5).and_return(2)
-            expect(Delayed::Job).to receive(:rand).with(3).and_return(1)
-            job = Delayed::Job.enqueue(SimpleJob.new, n_strand: ["njobs", "123"])
-            job.strand.should == "njobs/123:3"
-            job = Delayed::Job.enqueue(SimpleJob.new, n_strand: ["njobs", "456"])
-            job.strand.should == "njobs/456:2"
-          end
-        end
-      end
-    end
   end
 
   context "on hold" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canvas-jobs
 version: !ruby/object:Gem::Version
-  version: 0.9.16
+  version: 0.10.0
 platform: ruby
 authors:
 - Tobias Luetke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_transaction_commit
@@ -275,6 +275,7 @@ files:
 - db/migrate/20140505215510_copy_failed_jobs_original_id.rb
 - db/migrate/20140505223637_drop_failed_jobs_original_id.rb
 - db/migrate/20140512213941_add_source_to_jobs.rb
+- db/migrate/20150807133223_add_max_concurrent_to_jobs.rb
 - lib/canvas-jobs.rb
 - lib/delayed/backend/active_record.rb
 - lib/delayed/backend/base.rb
@@ -317,11 +318,8 @@ files:
 - spec/gemfiles/32.gemfile
 - spec/gemfiles/32.gemfile.lock
 - spec/gemfiles/40.gemfile
-- spec/gemfiles/40.gemfile.lock
 - spec/gemfiles/41.gemfile
-- spec/gemfiles/41.gemfile.lock
 - spec/gemfiles/42.gemfile
-- spec/gemfiles/42.gemfile.lock
 - spec/migrate/20140924140513_add_story_table.rb
 - spec/redis_job_spec.rb
 - spec/sample_jobs.rb
@@ -352,7 +350,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Instructure-maintained fork of delayed_job
@@ -364,11 +362,8 @@ test_files:
 - spec/gemfiles/32.gemfile
 - spec/gemfiles/32.gemfile.lock
 - spec/gemfiles/40.gemfile
-- spec/gemfiles/40.gemfile.lock
 - spec/gemfiles/41.gemfile
-- spec/gemfiles/41.gemfile.lock
 - spec/gemfiles/42.gemfile
-- spec/gemfiles/42.gemfile.lock
 - spec/migrate/20140924140513_add_story_table.rb
 - spec/redis_job_spec.rb
 - spec/sample_jobs.rb

data/spec/gemfiles/40.gemfile.lock

@@ -1,141 +0,0 @@
-PATH
-  remote: ../../
-  specs:
-    canvas-jobs (0.9.15)
-      after_transaction_commit (= 1.0.1)
-      rails (>= 3.2)
-      redis (> 3.0)
-      redis-scripting (~> 1.0.1)
-      rufus-scheduler (~> 3.1.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.0.13)
-      actionpack (= 4.0.13)
-      mail (~> 2.5, >= 2.5.4)
-    actionpack (4.0.13)
-      activesupport (= 4.0.13)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    activemodel (4.0.13)
-      activesupport (= 4.0.13)
-      builder (~> 3.1.0)
-    activerecord (4.0.13)
-      activemodel (= 4.0.13)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.13)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.4)
-    activesupport (4.0.13)
-      i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    after_transaction_commit (1.0.1)
-      activerecord (>= 3.2)
-    arel (4.0.2)
-    backports (3.6.6)
-    builder (3.1.4)
-    bump (0.5.2)
-    coderay (1.1.0)
-    database_cleaner (1.3.0)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    i18n (0.7.0)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    method_source (0.8.2)
-    mime-types (2.6.2)
-    minitest (4.7.5)
-    multi_json (1.11.2)
-    pg (0.18.3)
-    pry (0.10.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.5.5)
-    rack-protection (1.5.3)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.0.13)
-      actionmailer (= 4.0.13)
-      actionpack (= 4.0.13)
-      activerecord (= 4.0.13)
-      activesupport (= 4.0.13)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.13)
-      sprockets-rails (~> 2.0)
-    railties (4.0.13)
-      actionpack (= 4.0.13)
-      activesupport (= 4.0.13)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    redis (3.2.1)
-    redis-scripting (1.0.1)
-      redis (>= 3.0)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    rufus-scheduler (3.1.7)
-    sinatra (1.4.6)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    sinatra-contrib (1.4.6)
-      backports (>= 2.0)
-      multi_json
-      rack-protection
-      rack-test
-      sinatra (~> 1.4.0)
-      tilt (>= 1.3, < 3)
-    slop (3.6.0)
-    sprockets (3.4.0)
-      rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    syck (1.0.5)
-    test_after_commit (0.4.1)
-      activerecord (>= 3.2)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tilt (2.0.1)
-    timecop (0.7.1)
-    tzinfo (0.3.45)
-    wwtd (1.1.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bump
-  canvas-jobs!
-  database_cleaner (= 1.3.0)
-  pg
-  pry
-  rack-test
-  rails (~> 4.0.10)
-  rake
-  rspec (= 3.1.0)
-  sinatra
-  sinatra-contrib
-  syck (>= 1.0.4)
-  test_after_commit (= 0.4.1)
-  timecop (= 0.7.1)
-  wwtd (~> 1.1.1)

data/spec/gemfiles/41.gemfile.lock

@@ -1,147 +0,0 @@
-PATH
-  remote: ../../
-  specs:
-    canvas-jobs (0.9.15)
-      after_transaction_commit (= 1.0.1)
-      rails (>= 3.2)
-      redis (> 3.0)
-      redis-scripting (~> 1.0.1)
-      rufus-scheduler (~> 3.1.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.1.13)
-      actionpack (= 4.1.13)
-      actionview (= 4.1.13)
-      mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.13)
-      actionview (= 4.1.13)
-      activesupport (= 4.1.13)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    actionview (4.1.13)
-      activesupport (= 4.1.13)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-    activemodel (4.1.13)
-      activesupport (= 4.1.13)
-      builder (~> 3.1)
-    activerecord (4.1.13)
-      activemodel (= 4.1.13)
-      activesupport (= 4.1.13)
-      arel (~> 5.0.0)
-    activesupport (4.1.13)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    after_transaction_commit (1.0.1)
-      activerecord (>= 3.2)
-    arel (5.0.1.20140414130214)
-    backports (3.6.6)
-    builder (3.2.2)
-    bump (0.5.2)
-    coderay (1.1.0)
-    database_cleaner (1.3.0)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    i18n (0.7.0)
-    json (1.8.3)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    method_source (0.8.2)
-    mime-types (2.6.2)
-    minitest (5.8.1)
-    multi_json (1.11.2)
-    pg (0.18.3)
-    pry (0.10.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.5.5)
-    rack-protection (1.5.3)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.1.13)
-      actionmailer (= 4.1.13)
-      actionpack (= 4.1.13)
-      actionview (= 4.1.13)
-      activemodel (= 4.1.13)
-      activerecord (= 4.1.13)
-      activesupport (= 4.1.13)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.13)
-      sprockets-rails (~> 2.0)
-    railties (4.1.13)
-      actionpack (= 4.1.13)
-      activesupport (= 4.1.13)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    redis (3.2.1)
-    redis-scripting (1.0.1)
-      redis (>= 3.0)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    rufus-scheduler (3.1.7)
-    sinatra (1.4.6)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    sinatra-contrib (1.4.6)
-      backports (>= 2.0)
-      multi_json
-      rack-protection
-      rack-test
-      sinatra (~> 1.4.0)
-      tilt (>= 1.3, < 3)
-    slop (3.6.0)
-    sprockets (3.4.0)
-      rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    syck (1.0.5)
-    test_after_commit (0.4.1)
-      activerecord (>= 3.2)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tilt (2.0.1)
-    timecop (0.7.1)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    wwtd (1.1.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bump
-  canvas-jobs!
-  database_cleaner (= 1.3.0)
-  pg
-  pry
-  rack-test
-  rails (~> 4.1.6)
-  rake
-  rspec (= 3.1.0)
-  sinatra
-  sinatra-contrib
-  syck (>= 1.0.4)
-  test_after_commit (= 0.4.1)
-  timecop (= 0.7.1)
-  wwtd (~> 1.1.1)

data/spec/gemfiles/42.gemfile.lock

@@ -1,172 +0,0 @@
-PATH
-  remote: ../../
-  specs:
-    canvas-jobs (0.9.15)
-      after_transaction_commit (= 1.0.1)
-      rails (>= 3.2)
-      redis (> 3.0)
-      redis-scripting (~> 1.0.1)
-      rufus-scheduler (~> 3.1.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.2.4)
-      actionpack (= 4.2.4)
-      actionview (= 4.2.4)
-      activejob (= 4.2.4)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.4)
-      actionview (= 4.2.4)
-      activesupport (= 4.2.4)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.4)
-      activesupport (= 4.2.4)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.4)
-      activesupport (= 4.2.4)
-      globalid (>= 0.3.0)
-    activemodel (4.2.4)
-      activesupport (= 4.2.4)
-      builder (~> 3.1)
-    activerecord (4.2.4)
-      activemodel (= 4.2.4)
-      activesupport (= 4.2.4)
-      arel (~> 6.0)
-    activesupport (4.2.4)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    after_transaction_commit (1.0.1)
-      activerecord (>= 3.2)
-    arel (6.0.3)
-    backports (3.6.6)
-    builder (3.2.2)
-    bump (0.5.2)
-    coderay (1.1.0)
-    database_cleaner (1.3.0)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    globalid (0.3.6)
-      activesupport (>= 4.1.0)
-    i18n (0.7.0)
-    json (1.8.3)
-    loofah (2.0.3)
-      nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    method_source (0.8.2)
-    mime-types (2.6.2)
-    mini_portile (0.6.2)
-    minitest (5.8.1)
-    multi_json (1.11.2)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    pg (0.18.3)
-    pry (0.10.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.6.4)
-    rack-protection (1.5.3)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.4)
-      actionmailer (= 4.2.4)
-      actionpack (= 4.2.4)
-      actionview (= 4.2.4)
-      activejob (= 4.2.4)
-      activemodel (= 4.2.4)
-      activerecord (= 4.2.4)
-      activesupport (= 4.2.4)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.4)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
-      loofah (~> 2.0)
-    railties (4.2.4)
-      actionpack (= 4.2.4)
-      activesupport (= 4.2.4)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    redis (3.2.1)
-    redis-scripting (1.0.1)
-      redis (>= 3.0)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    rufus-scheduler (3.1.7)
-    sinatra (1.4.6)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    sinatra-contrib (1.4.6)
-      backports (>= 2.0)
-      multi_json
-      rack-protection
-      rack-test
-      sinatra (~> 1.4.0)
-      tilt (>= 1.3, < 3)
-    slop (3.6.0)
-    sprockets (3.4.0)
-      rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    syck (1.0.5)
-    test_after_commit (0.4.1)
-      activerecord (>= 3.2)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tilt (2.0.1)
-    timecop (0.7.1)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    wwtd (1.1.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bump
-  canvas-jobs!
-  database_cleaner (= 1.3.0)
-  pg
-  pry
-  rack-test
-  rails (~> 4.2.0.beta2)
-  rake
-  rspec (= 3.1.0)
-  sinatra
-  sinatra-contrib
-  syck (>= 1.0.4)
-  test_after_commit (= 0.4.1)
-  timecop (= 0.7.1)
-  wwtd (~> 1.1.1)