sidekiq-limit_fetch 2.1.3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d460d8048f5d1ef64e257f8af49ec1b7274eb966
-  data.tar.gz: 97b99fee5c035683ab9a8658d263190e0c5b2abd
+  metadata.gz: 99b2b29e276cbdb7e9c974939f367eba90ad62f4
+  data.tar.gz: 5076f7ceff7dd7e1e90d70fe8dd0e31dd48b8d6a
 SHA512:
-  metadata.gz: ebe51888c40335c3a8328536f5c3b57351bc856527c1b0acbb2f9e7818c70d911a3334735e123140b5aea04cce7571b564e8a4b74cc27725139337f1290c7169
-  data.tar.gz: b3e054be32248f8200615dc8c3b06e4f6d02c2e209eae5676fd8da44693b508f81c3ff3cf6add2a39a179fe18e963f8dda21136be5a6a9e59b846eefec8bcbb1
+  metadata.gz: a46d655a1c87cb0712fa22b134914992269aa3130469a2db05f1d8be107893aec01876e508a90178f736ae76d2f0b55e3aea6b27652782bd4635a80450ca5d8f
+  data.tar.gz: c47afed022d59b2c60183e02abfa3c11af41b55d35500b91b35c0e913a1bb037170500e8de3da46e7ed0950a99508635e4c8b2e3eaca06bfe2ced16171ee491c

data/README.md

@@ -26,6 +26,8 @@ https://devcenter.heroku.com/articles/redistogo#redis-2-6
 
 **Important note:** At this moment, `sidekiq-limit_fetch` is incompatible with Sidekiq Pro's `reliable_fetch`.
 
+https://github.com/mperham/sidekiq/issues/1508 — a sidekiq admin busy page is unreliable, so if you need to check how many workers are running a queue use a `#busy` method described below.
+
 ## Usage
 
 ### Limits

data/demo/README.md

@@ -1,2 +1,37 @@
-To test effect of limits run: `rake demo:limits`
-To change simulation see `Rakefile`
+This is a demo rails app with a configured sidekiq-limit_fetch.
+
+Its purpose is to check whether plugin works in certain situations.
+
+Application is preconfigured with two workers:
+- `app/workers/fast_worker.rb` which does `sleep 0.2`
+- `app/workers/slow_worker.rb` which does `sleep 1`
+
+There is also a rake task which can be invoked as `bundle exec rake demo:limit`:
+
+- it prefills sidekiq tasks
+
+```ruby
+  100.times do
+    SlowWorker.perform_async
+    FastWorker.perform_async
+  end
+```
+- sets sidekiq config
+
+```yaml
+  :verbose: false
+  :concurrency: 4
+  :queues:
+    - slow
+    - fast
+  :limits:
+    slow: 1
+```
+
+- and launches a sidekiq admin page with overview of queues in browser.
+The page is set to live-poll so effects of limits can be seen directly.
+
+
+To change simulation modify `Rakefile` or workers.
+
+Any bugs related to the plugin should be demonstrated with a reproduction from this base app.

data/demo/Rakefile

@@ -22,6 +22,45 @@ namespace :demo do
     YAML
   end
 
+  task blocking: :environment do
+    puts '=> Creating sidekiq tasks'
+
+    AWorker.perform_async
+    BWorker.perform_async
+    CWorker.perform_async
+
+    run_sidekiq_monitoring
+    run_sidekiq_workers config: <<-YAML
+      :verbose: false
+      :concurrency: 4
+      :queues:
+        - a
+        - b
+        - c
+      :blocking:
+        - a
+    YAML
+  end
+
+  task advanced_blocking: :environment do
+    puts '=> Creating sidekiq tasks'
+
+    AWorker.perform_async
+    BWorker.perform_async
+    CWorker.perform_async
+
+    run_sidekiq_monitoring
+    run_sidekiq_workers config: <<-YAML
+      :verbose: false
+      :concurrency: 4
+      :queues:
+        - a
+        - b
+        - c
+      :blocking:
+        - [a, b]
+    YAML
+  end
   def with_sidekiq_config(config)
     whitespace_offset = config[/\A */].size
     config.gsub! /^ {#{whitespace_offset}}/, ''
@@ -51,8 +90,7 @@ namespace :demo do
     end
 
     with_sidekiq_config options[:config] do
-      config = cli.send :parse_config, 'config/sidekiq.yml'
-      Sidekiq.options.merge! config
+      cli.send :setup_options, []
     end
 
     cli.run

data/demo/app/workers/a_worker.rb

@@ -0,0 +1,8 @@
+class AWorker
+  include Sidekiq::Worker
+  sidekiq_options queue: :a
+
+  def perform
+    sleep 10
+  end
+end

data/demo/app/workers/b_worker.rb

@@ -0,0 +1,8 @@
+class BWorker
+  include Sidekiq::Worker
+  sidekiq_options queue: :b
+
+  def perform
+    sleep 10
+  end
+end

data/demo/app/workers/c_worker.rb

@@ -0,0 +1,9 @@
+class CWorker
+  include Sidekiq::Worker
+  sidekiq_options queue: :c
+
+  def perform
+    sleep 10
+  end
+end
+

data/lib/sidekiq/limit_fetch/global/selector.rb

@@ -82,7 +82,9 @@ module Sidekiq::LimitFetch::Global
                 end
               end
 
-              blocking_mode = can_block and locks > 0
+              if not blocking_mode then
+                blocking_mode = can_block and locks > 0
+              end
 
               if blocking_mode and can_block ~= 'true' then
                 for unblocked_queue in string.gmatch(can_block, "[^,]+") do

data/lib/sidekiq/limit_fetch/global/semaphore.rb

@@ -18,7 +18,11 @@ module Sidekiq::LimitFetch::Global
     end
 
     def limit=(value)
-      redis {|it| it.set "#{PREFIX}:limit:#@name", value }
+      if value
+        redis {|it| it.set "#{PREFIX}:limit:#@name", value }
+      else
+        redis {|it| it.del "#{PREFIX}:limit:#@name" }
+      end
     end
 
     def process_limit
@@ -27,7 +31,11 @@ module Sidekiq::LimitFetch::Global
     end
 
     def process_limit=(value)
-      redis {|it| it.set "#{PREFIX}:process_limit:#@name", value }
+      if value
+        redis {|it| it.set "#{PREFIX}:process_limit:#@name", value }
+      else
+        redis {|it| it.del "#{PREFIX}:process_limit:#@name" }
+      end
     end
 
     def acquire
@@ -120,6 +128,15 @@ module Sidekiq::LimitFetch::Global
 
           Busy queue processes:
         #{busy_processes.sort.join "\n"}
+
+          Limit:
+        #{limit.inspect}
+
+          Process limit:
+        #{process_limit.inspect}
+
+          Blocking:
+        #{blocking?}
       END
     end
 

data/lib/sidekiq/limit_fetch/queues.rb

@@ -32,13 +32,16 @@ class Sidekiq::LimitFetch
     end
 
     def set(limit_type, limits)
-      return unless limits
-      limits.each do |name, limit|
-        Sidekiq::Queue[name].send "#{limit_type}=", limit
+      limits ||= {}
+      each_queue do |queue|
+        limit = limits[queue.name.to_s] || limits[queue.name.to_sym]
+        queue.send "#{limit_type}=", limit
       end
     end
 
     def set_blocks(blocks)
+      each_queue(&:unblock)
+
       blocks.to_a.each do |it|
         if it.is_a? Array
           it.each {|name| Sidekiq::Queue[name].block_except it }
@@ -66,5 +69,9 @@ class Sidekiq::LimitFetch
     ensure
       Thread.current[THREAD_KEY] = nil
     end
+    
+    def each_queue
+      @queues.uniq.each {|it| yield Sidekiq::Queue[it] }
+    end
   end
 end

data/sidekiq-limit_fetch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = 'sidekiq-limit_fetch'
-  gem.version       = '2.1.3'
+  gem.version       = '2.2.0'
   gem.license       = 'MIT'
   gem.authors       = 'brainopia'
   gem.email         = 'brainopia@evilmartians.com'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-limit_fetch
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0
 platform: ruby
 authors:
 - brainopia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-02 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -76,6 +76,9 @@ files:
 - demo/Gemfile
 - demo/README.md
 - demo/Rakefile
+- demo/app/workers/a_worker.rb
+- demo/app/workers/b_worker.rb
+- demo/app/workers/c_worker.rb
 - demo/app/workers/fast_worker.rb
 - demo/app/workers/slow_worker.rb
 - demo/config/application.rb