sidekiq 2.17.1 → 2.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24bfd443535efddca7164e0784c5317d25487673
-  data.tar.gz: 24e85e77a30f1e6dba72ae0a965fa63b4b8b5b33
+  metadata.gz: a9ab8dfc9a5a77f21aaf9fa21ba6be7e7660246c
+  data.tar.gz: 5898594eec812b1b4702ef9807c0e94216172f91
 SHA512:
-  metadata.gz: 8b031f54208e373dcf35a2c4da99a8756b6c5cfa8fe984e9bce4841d01240780dac4f052cdef86474788c23f317f9f54415bb3e2ce9cd1de868a621767291ea2
-  data.tar.gz: b66143b6db4ba974f8d9846728e109b27c3fb95fe3e8aa5182698e2c539e0a4d729b26da3e776d619b72d5c850c8e45e491cd186394d847f5e3cbb0d75e9479f
+  metadata.gz: 2fdca306a973f6a4e42c6f436d18c720dc7228c34cdcb1dc0b62c37b0be4d70940031e1b1f760b40f04bc203a2a571d289d6c1952a06efe932df13e691535292
+  data.tar.gz: cbc8fa44394a552fbc1ecb97d8bfb1ad82a841821a8cc2c83b17db517d23f038d5d55567059e495e43d632179fdb64d2064967f70f6f79528dc4b31ac0d11f12

data/.travis.yml

@@ -6,6 +6,7 @@ rvm:
   - jruby-19mode
   - rbx
   - 2.0.0
+  - 2.1.0
 matrix:
   allow_failures:
     - rvm: jruby-19mode

data/Changes.md

@@ -1,3 +1,10 @@
+2.17.2
+-----------
+
+- Fix race condition in bulk requeue during shutdown [#1406]
+- Fix bug where strictly prioritized queues might be processed out of
+  order [#1408]
+
 2.17.1
 -----------
 

data/Pro-Changes.md

@@ -3,6 +3,12 @@ Sidekiq Pro Changelog
 
 Please see [http://sidekiq.org/pro](http://sidekiq.org/pro) for more details and how to buy.
 
+HEAD
+-----------
+
+- Add batch progress bar to batch detail page. [#1398]
+
+
 1.4.0
 -----------
 

data/lib/sidekiq/api.rb

@@ -10,10 +10,12 @@ module Sidekiq
       Sidekiq.redis { |conn| conn.get("stat:failed") }.to_i
     end
 
-    def reset
+    def reset(*stats)
+      all   = %w(failed processed)
+      stats = stats.empty? ? all : all & stats.flatten.compact.map(&:to_s)
+
       Sidekiq.redis do |conn|
-        conn.set("stat:failed", 0)
-        conn.set("stat:processed", 0)
+        stats.each { |stat| conn.set("stat:#{stat}", 0) }
       end
     end
 

data/lib/sidekiq/cli.rb

@@ -174,13 +174,15 @@ module Sidekiq
     end
 
     def setup_options(args)
-      cli = parse_options(args)
-      set_environment cli[:environment]
+      opts = parse_options(args)
+      set_environment opts[:environment]
 
-      cfile = cli[:config_file]
+      cfile = opts[:config_file]
+      opts = parse_config(cfile).merge(opts) if cfile
+      
+      opts[:strict] = true if opts[:strict].nil?
 
-      config = (cfile ? parse_config(cfile) : {})
-      options.merge!(config.merge(cli))
+      options.merge!(opts)
     end
 
     def options
@@ -256,9 +258,9 @@ module Sidekiq
           opts[:profile] = arg
         end
 
-        o.on "-q", "--queue QUEUE[,WEIGHT]...", "Queues to process with optional weights" do |arg|
-          queues_and_weights = arg.scan(/([\w\.-]+),?(\d*)/)
-          parse_queues opts, queues_and_weights
+        o.on "-q", "--queue QUEUE[,WEIGHT]", "Queues to process with optional weights" do |arg|
+          queue, weight = arg.split(",")
+          parse_queue opts, queue, weight
         end
 
         o.on '-r', '--require [PATH|DIR]', "Location of Rails application with workers or file to require" do |arg|
@@ -334,14 +336,14 @@ module Sidekiq
     end
 
     def parse_queues(opts, queues_and_weights)
-      queues_and_weights.each {|queue_and_weight| parse_queue(opts, *queue_and_weight)}
-      opts[:strict] = queues_and_weights.all? {|_, weight| weight.to_s.empty? }
+      queues_and_weights.each { |queue_and_weight| parse_queue(opts, *queue_and_weight) }
     end
 
     def parse_queue(opts, q, weight=nil)
       [weight.to_i, 1].max.times do
        (opts[:queues] ||= []) << q
       end
+      opts[:strict] = false if weight.to_i > 0
     end
   end
 end

data/lib/sidekiq/launcher.rb

@@ -48,6 +48,9 @@ module Sidekiq
 
         manager.async.stop(:shutdown => true, :timeout => @options[:timeout])
         manager.wait(:shutdown)
+
+        # Requeue everything in case there was a worker who grabbed work while stopped
+        Sidekiq::Fetcher.strategy.bulk_requeue([], @options)
       end
     end
 

data/lib/sidekiq/manager.rb

@@ -162,12 +162,11 @@ module Sidekiq
         watchdog("Manager#hard_shutdown_in died") do
           # We've reached the timeout and we still have busy workers.
           # They must die but their messages shall live on.
-          logger.info("Still waiting for #{@busy.size} busy workers")
+          logger.warn { "Terminating #{@busy.size} busy worker threads" }
+          logger.warn { "Work still in progress #{@in_progress.values.inspect}" }
 
           requeue
 
-          logger.warn { "Terminating #{@busy.size} busy worker threads" }
-          logger.warn { "Work still in progress #{@in_progress.values.inspect}" }
           @busy.each do |processor|
             if processor.alive? && t = @threads.delete(processor.object_id)
               t.raise Shutdown

data/lib/sidekiq/middleware/i18n.rb

@@ -14,7 +14,7 @@ module Sidekiq::Middleware::I18n
       I18n.locale = msg['locale'] || I18n.default_locale
       yield
     ensure
-      I18n.locale = nil
+      I18n.locale = I18n.default_locale
     end
   end
 end

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "2.17.1"
+  VERSION = "2.17.2"
 end

data/test/test_api.rb

@@ -33,15 +33,44 @@ class TestApi < Sidekiq::Test
     end
 
     describe "reset" do
-      it 'can reset stats' do
+      before do
         Sidekiq.redis do |conn|
           conn.set('stat:processed', 5)
           conn.set('stat:failed', 10)
-          Sidekiq::Stats.new.reset
+        end
+      end
+
+      it 'will reset all stats by default' do
+        Sidekiq::Stats.new.reset
+        Sidekiq.redis do |conn|
           assert_equal '0', conn.get('stat:processed')
           assert_equal '0', conn.get('stat:failed')
         end
       end
+
+      it 'can reset individual stats' do
+        Sidekiq::Stats.new.reset('failed')
+        Sidekiq.redis do |conn|
+          assert_equal '5', conn.get('stat:processed')
+          assert_equal '0', conn.get('stat:failed')
+        end
+      end
+
+      it 'can accept anything that responds to #to_s' do
+        Sidekiq::Stats.new.reset(:failed)
+        Sidekiq.redis do |conn|
+          assert_equal '5', conn.get('stat:processed')
+          assert_equal '0', conn.get('stat:failed')
+        end
+      end
+
+      it 'ignores anything other than "failed" or "processed"' do
+        Sidekiq::Stats.new.reset((1..10).to_a, ['failed'])
+        Sidekiq.redis do |conn|
+          assert_equal '5', conn.get('stat:processed')
+          assert_equal '0', conn.get('stat:failed')
+        end
+      end
     end
 
     describe "queues" do

data/test/test_cli.rb

@@ -51,7 +51,7 @@ class TestCli < Sidekiq::Test
     end
 
     it 'sets strictly ordered queues if weights are not present' do
-      @cli.parse(['sidekiq', '-q', 'foo,bar', '-r', './test/fake_env.rb'])
+      @cli.parse(['sidekiq', '-q', 'foo', '-q', 'bar', '-r', './test/fake_env.rb'])
       assert_equal true, !!Sidekiq.options[:strict]
     end
 
@@ -60,23 +60,23 @@ class TestCli < Sidekiq::Test
       assert_equal false, !!Sidekiq.options[:strict]
     end
 
+    it 'does not set strictly ordered queues if weights are present with multiple queues' do
+      @cli.parse(['sidekiq', '-q', 'foo,3', '-q', 'bar', '-r', './test/fake_env.rb'])
+      assert_equal false, !!Sidekiq.options[:strict]
+    end
+
     it 'changes timeout' do
       @cli.parse(['sidekiq', '-t', '30', '-r', './test/fake_env.rb'])
       assert_equal 30, Sidekiq.options[:timeout]
     end
 
-    it 'handles multiple queues with weights with multiple switches' do
+    it 'handles multiple queues with weights' do
       @cli.parse(['sidekiq', '-q', 'foo,3', '-q', 'bar', '-r', './test/fake_env.rb'])
       assert_equal %w(foo foo foo bar), Sidekiq.options[:queues]
     end
 
-    it 'handles multiple queues with weights with a single switch' do
-      @cli.parse(['sidekiq', '-q', 'bar,foo,3', '-r', './test/fake_env.rb'])
-      assert_equal %w(bar foo foo foo), Sidekiq.options[:queues]
-    end
-
     it 'handles queues with multi-word names' do
-      @cli.parse(['sidekiq', '-q', 'queue_one,queue-two', '-r', './test/fake_env.rb'])
+      @cli.parse(['sidekiq', '-q', 'queue_one', '-q', 'queue-two', '-r', './test/fake_env.rb'])
       assert_equal %w(queue_one queue-two), Sidekiq.options[:queues]
     end
 
@@ -287,18 +287,20 @@ class TestCli < Sidekiq::Test
     describe 'Sidekiq::CLI#parse_queues' do
       describe 'when weight is present' do
         it 'concatenates queues by factor of weight and sets strict to false' do
-          opts = {}
-          @cli.send :parse_queues, opts, [['often', 7]]
-          assert_equal %w[often] * 7, opts[:queues]
+          opts = { strict: true }
+          @cli.send :parse_queues, opts, [['often', 7], ['repeatedly', 3]]
+          @cli.send :parse_queues, opts, [['once']]
+          assert_equal (%w[often] * 7 + %w[repeatedly] * 3 + %w[once]), opts[:queues]
           assert !opts[:strict]
         end
       end
 
       describe 'when weight is not present' do
         it 'returns queues and sets strict' do
-          opts = {}
-          @cli.send :parse_queues, opts, [['once']]
-          assert_equal %w[once], opts[:queues]
+          opts = { strict: true }
+          @cli.send :parse_queues, opts, [['once'], ['one_time']]
+          @cli.send :parse_queues, opts, [['einmal']]
+          assert_equal %w[once one_time einmal], opts[:queues]
           assert opts[:strict]
         end
       end
@@ -306,18 +308,20 @@ class TestCli < Sidekiq::Test
 
     describe 'Sidekiq::CLI#parse_queue' do
       describe 'when weight is present' do
-        it 'concatenates queue to opts[:queues] weight number of times' do
-          opts = {}
+        it 'concatenates queue to opts[:queues] weight number of times and sets strict to false' do
+          opts = { strict: true }
           @cli.send :parse_queue, opts, 'often', 7
           assert_equal %w[often] * 7, opts[:queues]
+          assert !opts[:strict]
         end
       end
 
       describe 'when weight is not present' do
-        it 'concatenates queue to opts[:queues] once' do
-          opts = {}
+        it 'concatenates queue to opts[:queues] once and leaves strict true' do
+          opts = { strict: true }
           @cli.send :parse_queue, opts, 'once', nil
           assert_equal %w[once], opts[:queues]
+          assert opts[:strict]
         end
       end
     end

data/test/test_middleware.rb

@@ -123,7 +123,7 @@ class TestMiddleware < Sidekiq::Test
       assert_equal :fr, msg['locale']
 
       msg['locale'] = 'jp'
-      I18n.locale = nil
+      I18n.locale = I18n.default_locale
       assert_equal :en, I18n.locale
       mw = Sidekiq::Middleware::I18n::Server.new
       mw.call(nil, msg, nil) do
@@ -131,5 +131,19 @@ class TestMiddleware < Sidekiq::Test
       end
       assert_equal :en, I18n.locale
     end
+
+    it 'supports I18n.enforce_available_locales = true' do
+      I18n.enforce_available_locales = true
+      I18n.available_locales = [:en, :jp]
+
+      msg = { 'locale' => 'jp' }
+      mw = Sidekiq::Middleware::I18n::Server.new
+      mw.call(nil, msg, nil) do
+        assert_equal :jp, I18n.locale
+      end
+
+      I18n.enforce_available_locales = nil
+      I18n.available_locales = nil
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.17.1
+  version: 2.17.2
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-15 00:00:00.000000000 Z
+date: 2014-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -352,7 +352,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Simple, efficient background processing for Ruby