unicorn-worker-killer 0.2.2 → 0.3.0

data/README.md

@@ -25,17 +25,17 @@ Add these lines to your `config.ru`.
 
 This gem provides two modules.
 
-### Unicorn::WorkerKiller::MaxRequests(max_requests = 1024)
+### Unicorn::WorkerKiller::MaxRequests(max_requests_min=3072, max_requests_max=4096)
 
 This module automatically restarts the Unicorn workers, based on the number of requests which worker processed.
 
-`max_requests` specifies the maximum number of requests which this worker should process. Once the number exceeds `max_requests`, that worker is automatically restarted. It's highly recommended to randomize this number to avoid restarting all workers at once.
+`max_requests_min` and `max_requests_max` specify the min and max of maximum requests per worker. The actual limit is decided by rand() between `max_requests_min` and `max_requests_max` per worker, to prevent all workers to be dead at the same time. Once the number exceeds the limit, that worker is automatically restarted.
 
-### Unicorn::WorkerKiller::Oom(memory_size = (1024**3), check_cycle = 16)
+### Unicorn::WorkerKiller::Oom(memory_limit_min=(1024**3), memory_limit_max=(2*(1024**3)), check_cycle = 16)
 
 This module automatically restarts the Unicorn workers, based on its memory size.
 
-`memory_size` specifies the maximum memory which this worker can have. Once the memory size exceeds `memory_size`, that worker is automatically restarted. It's highly recommended to randomize this number to avoid restarting all workers at once.
+`memory_limit_min` and `memory_limit_max` specify the min and max of maximum memory per worker. The actual limit is decided by rand() between `memory_limit_min` and `memory_limit_max` per worker, to prevent all workers to be dead at the same time.  Once the memory size exceeds `memory_size`, that worker is automatically restarted.
 
 The memory size check is done in every `check_cycle` requests.
 

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/lib/unicorn/worker_killer.rb

@@ -28,10 +28,11 @@ module Unicorn::WorkerKiller
     # affect the request.
     #
     # @see https://github.com/defunkt/unicorn/blob/master/lib/unicorn/oob_gc.rb#L40
-    def self.new(app, memory_size = (1024**3), check_cycle = 16)
+    def self.new(app, memory_limit_min = (1024**3), memory_limit_max = (2*(1024**3)), check_cycle = 16)
       ObjectSpace.each_object(Unicorn::HttpServer) do |s|
         s.extend(self)
-        s.instance_variable_set(:@_worker_memory_size, memory_size)
+        s.instance_variable_set(:@_worker_memory_limit_min, memory_limit_min)
+        s.instance_variable_set(:@_worker_memory_limit_max, memory_limit_max)
         s.instance_variable_set(:@_worker_check_cycle, check_cycle)
         s.instance_variable_set(:@_worker_check_count, 0)
       end
@@ -40,13 +41,14 @@ module Unicorn::WorkerKiller
 
     def process_client(client)
       @_worker_process_start ||= Time.now
+      @_worker_memory_limit ||= Random.rand(@_worker_memory_limit_min..@_worker_memory_limit_max)
       super(client) # Unicorn::HttpServer#process_client
 
       @_worker_check_count += 1
       if @_worker_check_count % @_worker_check_cycle == 0
         rss = _worker_rss()
-        if rss > @_worker_memory_size
-          logger.warn "#{self}: worker (pid: #{Process.pid}) exceeds memory limit (#{rss} bytes > #{@_worker_memory_size} bytes)"
+        if rss > @_worker_memory_limit
+          logger.warn "#{self}: worker (pid: #{Process.pid}) exceeds memory limit (#{rss} bytes > #{@_worker_memory_limit} bytes)"
           Unicorn::WorkerKiller.kill_self(logger, @_worker_process_start)
         end
         @_worker_check_count = 0
@@ -91,17 +93,19 @@ module Unicorn::WorkerKiller
     # affect the request.
     #
     # @see https://github.com/defunkt/unicorn/blob/master/lib/unicorn/oob_gc.rb#L40
-    def self.new(app, max_requests = 1024)
+    def self.new(app, max_requests_min = 3072, max_requests_max = 4096)
       ObjectSpace.each_object(Unicorn::HttpServer) do |s|
         s.extend(self)
-        s.instance_variable_set(:@_worker_max_requests, max_requests)
-        s.instance_variable_set(:@_worker_cur_requests, max_requests)
+        s.instance_variable_set(:@_worker_max_requests_min, max_requests_min)
+        s.instance_variable_set(:@_worker_max_requests_max, max_requests_max)
       end
       app # pretend to be Rack middleware since it was in the past
     end
 
     def process_client(client)
       @_worker_process_start ||= Time.now
+      @_worker_cur_requests ||= Random.rand(@_worker_max_requests_min..@_worker_max_requests_max)
+      @_worker_max_requests ||= @_worker_cur_requests
       super(client) # Unicorn::HttpServer#process_client
 
       if (@_worker_cur_requests -= 1) <= 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unicorn-worker-killer
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-30 00:00:00.000000000 Z
+date: 2012-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unicorn