Add thread reaping to thread pool

puma · May 19, 2015 · 5e95791ccaefdf8f79287fcb12b7c40115f392bb · 5e95791
1 parent 6479e6b
commit 5e95791ccaefdf8f79287fcb12b7c40115f392bb
Unified Split

Showing with 99 additions and 0 deletions.

+6 −0 lib/puma/server.rb

+46 −0 lib/puma/thread_pool.rb

+47 −0 test/test_thread_pool.rb
diff --git a/lib/puma/server.rb b/lib/puma/server.rb
@@ -39,6 +39,7 @@ class Server
    attr_accessor :max_threads
    attr_accessor :persistent_timeout
    attr_accessor :auto_trim_time
+  
+    attr_accessor :reaping_time
    attr_accessor :first_data_timeout
    # Create a server for the rack app +app+.
@@ -60,6 +61,7 @@ def initialize(app, events=Events.stdio, options={})
      @min_threads = 0
      @max_threads = 16
      @auto_trim_time = 1
+  
+      @reaping_time = 1
      @thread = nil
      @thread_pool = nil
@@ -274,6 +276,10 @@ def run(background=true)
        @reactor.run_in_thread
      end
+  
+      if @reaping_time
+  
+        @thread_pool.auto_reap!(@reaping_time)
+  
+      end
+  
+
      if @auto_trim_time
        @thread_pool.auto_trim!(@auto_trim_time)
      end

diff --git a/lib/puma/thread_pool.rb b/lib/puma/thread_pool.rb
@@ -33,6 +33,7 @@ def initialize(min, max, *extra, &block)
      @workers = []
      @auto_trim = nil
+  
+      @reaper = nil
      @mutex.synchronize do
        @min.times { spawn_thread }
@@ -155,6 +156,21 @@ def trim(force=false)
      end
    end
+  
+    # If there are dead threads in the pool make them go away while decreasing
+  
+    # spwaned counter so that new healty threads could be created again.
+  
+    def reap
+  
+      @mutex.synchronize do
+  
+        dead_workers = @workers.reject(&:alive?)
+  
+
+  
+        dead_workers.each do |worker|
+  
+          worker.kill
+  
+          @spawned -= 1
+  
+        end
+  
+
+  
+        @workers -= dead_workers
+  
+      end
+  
+    end
+  
+
    class AutoTrim
      def initialize(pool, timeout)
        @pool = pool
@@ -184,6 +200,35 @@ def auto_trim!(timeout=5)
      @auto_trim.start!
    end
+  
+    class Reaper
+  
+      def initialize(pool, timeout)
+  
+        @pool = pool
+  
+        @timeout = timeout
+  
+        @running = false
+  
+      end
+  
+
+  
+      def start!
+  
+        @running = true
+  
+
+  
+        @thread = Thread.new do
+  
+          while @running
+  
+            @pool.reap
+  
+            sleep @timeout
+  
+          end
+  
+        end
+  
+      end
+  
+
+  
+      def stop
+  
+        @running = false
+  
+        @thread.wakeup
+  
+      end
+  
+    end
+  
+
+  
+    def auto_reap!(timeout=5)
+  
+      @reaper = Reaper.new(self, timeout)
+  
+      @reaper.start!
+  
+    end
+  
+
    # Tell all threads in the pool to exit and wait for them to finish.
    #
    def shutdown
@@ -193,6 +238,7 @@ def shutdown
        @not_full.broadcast
        @auto_trim.stop if @auto_trim
+  
+        @reaper.stop if @reaper
      end
      # Use this instead of #each so that we don't stop in the middle

diff --git a/test/test_thread_pool.rb b/test/test_thread_pool.rb
@@ -179,4 +179,51 @@ def test_cleanliness
    assert_equal [], values.compact
  end
+  
+
+  
+  def test_reap_only_dead_threads
+  
+    pool = new_pool(2,2) { Thread.current.kill }
+  
+
+  
+    assert_equal 2, pool.spawned
+  
+
+  
+    pool << 1
+  
+
+  
+    pause
+  
+
+  
+    assert_equal 2, pool.spawned
+  
+
+  
+    pool.reap
+  
+
+  
+    assert_equal 1, pool.spawned
+  
+
+  
+    pool << 2
+  
+
+  
+    pause
+  
+
+  
+    assert_equal 1, pool.spawned
+  
+
+  
+    pool.reap
+  
+
+  
+    assert_equal 0, pool.spawned
+  
+  end
+  
+
+  
+  def test_auto_reap_dead_threads
+  
+    pool = new_pool(2,2) { Thread.current.kill }
+  
+
+  
+    assert_equal 2, pool.spawned
+  
+
+  
+    pool << 1
+  
+    pool << 2
+  
+
+  
+    pause
+  
+
+  
+    assert_equal 2, pool.spawned
+  
+
+  
+    pool.auto_reap! 1
+  
+
+  
+    sleep 1
+  
+
+  
+    pause
+  
+
+  
+    assert_equal 0, pool.spawned
+  
+  end
 end