sidekiq-pool 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 007c8607d7612d084d2836d9eba49ce492bd318e
-  data.tar.gz: b38de4932f6f0e15212adad140d5121e736e8e2f
+  metadata.gz: 1e09b8656dabef56cc9db19da9ab961fae510cf9
+  data.tar.gz: 18eac57149dde145c504ae79efe5c02064e82499
 SHA512:
-  metadata.gz: df48c578b96944b650df65db2fca3cf5ddc9d4ac59868769658e8c7bf20f36803c975b8a4dfc47406858ce72676a9dc84da0ee85dbdd652f994920e5d7d4eef8
-  data.tar.gz: ae7248a39b67a5a6f4d6e09e4e209043b679f472ca00ff8cabe9aaff242f5c9dbae64c4b08c1e81ba5ce3b9e9a45538deb6369e332f71ab236ce792cc07ba27e
+  metadata.gz: a16ca326b2961c3e3e1db6f2835f00d65c0009b1778922e1b63b30c2e9921deed52ed8d44a83d3c7879fa44b41b80198c42db38a25860e7bfde239f60148246b
+  data.tar.gz: b075f9b7471a25a389fc8c2ec3adfc31ee57fd80ab9688ecd91cff99cdfce11ff634667482e6cb46a3016302a733085b8b5b58d0c224e95a641d2aa4add7787f

data/lib/sidekiq/pool/cli.rb

@@ -120,6 +120,10 @@ module Sidekiq
             @working_directory = arg
           end
 
+          o.on '--wait-until-child-loaded NUM', "Seconds to wait until forked child is busy" do |arg|
+            @wait_until_child_loaded = Integer(arg)
+          end
+
           o.on '-V', '--version', "Print version and exit" do |arg|
             puts "Sidekiq #{Sidekiq::VERSION}"
             die(0)
@@ -168,6 +172,15 @@ module Sidekiq
           options[:index] = @child_index++
           run_child
         end
+
+        wait_until_child_loaded ||= (@wait_until_child_loaded || 30)
+
+        until cmdline_busy?(pid)
+          break if (wait_until_child_loaded -= 1).zero?
+          logger.info "Waiting for child #{pid} to be busy break in #{wait_until_child_loaded}"
+          sleep 1
+        end
+
         @pool << { pid: pid, command: command }
       end
 
@@ -249,6 +262,13 @@ module Sidekiq
         false
       end
 
+      def cmdline_busy?(pid)
+        return unless alive?(pid)
+        cmdline = File.read("/proc/#{pid}/cmdline")
+        return if cmdline.empty?
+        !cmdline.scan(/busy\]/).empty?
+      end
+
       def stop_children(given_pool = @pool)
         @done = true
         logger.info 'Stopping children'

data/lib/sidekiq/pool/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Pool
-    VERSION = '1.2.0'
+    VERSION = '1.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-pool
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Laurynas Butkus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-07 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq