garbageman 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/garbageman.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "garbageman"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Doug Youch"]
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     "lib/garbageman.rb",
     "lib/garbageman/collector.rb",
     "lib/garbageman/config.rb",
+    "lib/garbageman/ext/fiber_pool.rb",
     "lib/garbageman/ext/thin.rb",
     "lib/garbageman/rack/middleware.rb",
     "test/helper.rb",

data/lib/garbageman/collector.rb

@@ -31,6 +31,13 @@ module GarbageMan
     end
 
     def collect
+      # if we are starting to queue requests turn on gc, we could be in trouble
+      if queuing?
+        debug "queuing request, enabling gc"
+        GC.enable
+        return
+      end
+
       return unless can_collect?
 
       write_gc_yaml server_index, 'starting'
@@ -105,6 +112,14 @@ module GarbageMan
       fiber_poll && fiber_poll.busy_fibers.size > 0
     end
 
+    def queuing?
+      fiber_poll && fiber_poll.queue.size > 0
+    end
+
+    def not_queuing?
+      ! queuing?
+    end
+
     # no traffic and we've been selected by health check
     def can_collect?
       @will_collect && ! busy? && Thin::Backends::Base.num_connections == 0
@@ -121,21 +136,21 @@ module GarbageMan
     end
 
     def can_disable?
-      Config.thin_config.has_key?('socket') && not_alone?
+      Config.thin_config.has_key?('socket') && not_queuing? && min_running_servers?
     end
 
-    # make sure I'm not the only server running
-    def not_alone?
+    def num_running_servers
+      count = 0
       Config.thin_config['servers'].times do |i|
         next if i == server_index
-        file = socket_file i
-        if File.exists?(file)
-          return true
-        end
+        count += 1 if File.exists?(socket_file(i))
       end
+      count
+    end
 
-      debug "no other servers found"
-      false
+    # make sure there are 3 or more servers running before disabling gc
+    def min_running_servers?
+      num_servers >= Config.min_servers_to_disable_gc && num_running_servers >= Config.min_servers_to_disable_gc
     end
 
     def socket_file(index)

data/lib/garbageman/config.rb

@@ -19,5 +19,6 @@ module GarbageMan
     def self.thin_config; @@thin_config ||= YAML.load_file("./config/thin.yml"); end
 
     def self.num_request_before_collecting; 10; end
+    def self.min_servers_to_disable_gc; 3; end
   end
 end

data/lib/garbageman/ext/fiber_pool.rb

@@ -0,0 +1,3 @@
+class FiberPool
+  attr_reader :queue
+end

data/lib/garbageman/rack/middleware.rb

@@ -13,7 +13,8 @@ module GarbageMan
         if env['REQUEST_PATH'] == GarbageMan::Config.gc_health_check_request_path
           GarbageMan::Collector.instance.healthy? ? @@ok_response : @@gc_response
         else
-          GarbageMan::Collector.instance.logger.error("still receiving traffic even though I'm waiting to GC") if GarbageMan::Collector.instance.will_collect
+          # this is not 100% preventable with nginx, nginx will still send requests while waiting for the health check response
+          GarbageMan::Collector.instance.logger.debug("still receiving traffic even though I'm waiting to GC") if GarbageMan::Collector.instance.will_collect
           @app.call(env)
         end
       end

data/lib/garbageman.rb

@@ -23,5 +23,6 @@ end
 
 require 'garbageman/config'
 require 'garbageman/ext/thin'
+require 'garbageman/ext/fiber_pool'
 require 'garbageman/rack/middleware'
 require 'garbageman/collector'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: garbageman
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -80,6 +80,7 @@ files:
 - lib/garbageman.rb
 - lib/garbageman/collector.rb
 - lib/garbageman/config.rb
+- lib/garbageman/ext/fiber_pool.rb
 - lib/garbageman/ext/thin.rb
 - lib/garbageman/rack/middleware.rb
 - test/helper.rb
@@ -99,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -932921230500805269
+      hash: -3173816017839592880
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: