sidekiq-worker-killer 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4be8fc2573572f8428c331dc1ea372c951898f13
-  data.tar.gz: cc93aa9658b9becb22c499aaf6d73a8b24629aaa
+  metadata.gz: 4269c4f6da1a1eff0beed38c5ced2f6fca035b83
+  data.tar.gz: 9d9fb7cb1bf97982dfb489ab5a397b06930c0620
 SHA512:
-  metadata.gz: 62f4ed8ef018035f1688aa4f90ac92bab7127814ebed837ef51b4743be6966bb1f59c87df05dc73d0bfe0a2d882c9aa3ef024a35b84e126165ef8f71b3816b71
-  data.tar.gz: 2852845d75c163bd682dd1bf073040bd620c68d871eaddb5cb818dfe3cc2e39aa0532264b223572d59c23cbbe804ba06d38770e941fec4e6bd809b9854931b03
+  metadata.gz: 716ea8ce12527e8653f0bc08c9cc16acc428917340907a9701e2e45d8f3996a157dacc634a96d0db74db3dfa949ba8ffb0377391837942df5d343d5b1870463f
+  data.tar.gz: 0f04a39f3ac416f231e7b075a34ce827f4c435183e1b2277d50ce1fb4392b66a7ddcef59c60d4c0e1392ac34c572849501624d8be642b3cb76495562ebd85cd5

data/README.md

@@ -32,7 +32,7 @@ The following options can be overrided.
 | Option | Defaults | Description |
 | ------- | ------- | ----------- |
 | max_rss | 0 MB (disabled) | max RSS in megabytes. Above this, shutdown will be triggered. |
-| grace_time | 900 seconds | when shutdown is triggered, the Sidekiq process will not accept new job but wait 15 minutes for running jobs to finish.  |
+| grace_time | 900 seconds | when shutdown is triggered, the Sidekiq process will not accept new job and wait at most 15 minutes for running jobs to finish.  |
 | shutdown_wait | 30 seconds | when the grace time expires, still running jobs get 30 seconds to terminate. After that, kill signal is triggered.  |
 | kill_signal | SIGKILL | Signal to use kill Sidekiq process if it doesn't terminate.  |
 

data/lib/sidekiq/worker_killer.rb

@@ -21,6 +21,8 @@ module Sidekiq
       yield
       # Skip if the max RSS is not exceeded
       return unless @max_rss > 0 && current_rss > @max_rss
+      GC.start(full_mark: true, immediate_sweep: true)
+      return unless @max_rss > 0 && current_rss > @max_rss
       # Launch the shutdown process
       warn "current RSS #{current_rss} of #{identity} exceeds " \
            "maximum RSS #{@max_rss}"
@@ -43,7 +45,7 @@ module Sidekiq
       signal(quiet_signal, pid)
 
       warn "shutting down #{identity} in #{@grace_time} seconds"
-      sleep(@grace_time)
+      wait_job_finish_in_grace_time
 
       warn "sending SIGTERM to #{identity}"
       signal("SIGTERM", pid)
@@ -56,6 +58,21 @@ module Sidekiq
       signal(@kill_signal, pid)
     end
 
+    def wait_job_finish_in_grace_time
+      start = Time.now
+      loop do
+        break if start + @grace_time < Time.now || no_jobs_on_quiet_processes?
+        sleep(1)
+      end
+    end
+
+    def no_jobs_on_quiet_processes?
+      Sidekiq::ProcessSet.new.each do |process|
+        return false if !process["busy"].zero? && process["quiet"]
+      end
+      true
+    end
+
     def current_rss
       ::GetProcessMem.new.mb
     end

data/lib/sidekiq/worker_killer/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   class WorkerKiller
-    VERSION = "0.2.1".freeze
+    VERSION = "0.3.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-worker-killer
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Cyrille Courtiere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-13 00:00:00.000000000 Z
+date: 2018-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: get_process_mem
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Sidekiq worker killer