unicorn 4.1.0 → 4.1.1

data/.document

@@ -19,9 +19,11 @@ lib/unicorn/preread_input.rb
 lib/unicorn/stream_input.rb
 lib/unicorn/tee_input.rb
 lib/unicorn/util.rb
+lib/unicorn/oob_gc.rb
 lib/unicorn/worker.rb
 unicorn_1
 unicorn_rails_1
 ISSUES
 Sandbox
 Links
+Application_Timeouts

data/Application_Timeouts

@@ -0,0 +1,77 @@
+= Application Timeouts
+
+This article focuses on _application_ setup for Rack applications, but
+can be expanded to all applications that connect to external resources
+and expect short response times.
+
+This article is not specific to \Unicorn, but exists to discourage
+the overuse of the built-in
+{timeout}[link:Unicorn/Configurator.html#method-i-timeout] directive
+in \Unicorn.
+
+== ALL External Resources Are Considered Unreliable
+
+Network reliability can _never_ be guaranteed.  Network failures cannot
+be detected reliably by the client (Rack application) in a reasonable
+timeframe, not even on a LAN.
+
+Thus, application authors must configure timeouts when interacting with
+external resources.
+
+Most database adapters allow configurable timeouts.
+
+Net::HTTP and Net::SMTP in the Ruby standard library allow
+configurable timeouts.
+
+Even for things as fast as {memcached}[http://memcached.org/],
+{dalli}[http://rubygems.org/gems/dalli],
+{memcached}[http://rubygems.org/gems/memcached] and
+{memcache-client}[http://rubygems.org/gems/memcache-client] RubyGems all
+offer configurable timeouts.
+
+Consult the relevant documentation for the libraries you use on
+how to configure these timeouts.
+
+== Rolling Your Own Socket Code
+
+Use non-blocking I/O and IO.select with a timeout to wait on sockets.
+
+== Timeout module in the Ruby standard library
+
+Ruby offers a Timeout module in its standard library.  It has several
+caveats and is not always reliable:
+
+* /Some/ Ruby C extensions are not interrupted/timed-out gracefully by
+  this module (report these bugs to extension authors, please) but
+  pure-Ruby components should be.
+
+* Long-running tasks may run inside `ensure' clauses after timeout
+  fires, causing the timeout to be ineffective.
+
+The Timeout module is a second-to-last-resort solution, timeouts using
+IO.select (or similar) are more reliable.  If you depend on libraries
+that do not offer timeouts when connecting to external resources, kindly
+ask those library authors to provide configurable timeouts.
+
+=== A Note About Filesystems
+
+Most operations to regular files on POSIX filesystems are NOT
+interruptable.  Thus, the "timeout" module in the Ruby standard library
+can not reliably timeout systems with massive amounts of iowait.
+
+If your app relies on the filesystem, ensure all the data your
+application works with is small enough to fit in the kernel page cache.
+Otherwise increase the amount of physical memory you have to match, or
+employ a fast, low-latency storage system (solid state).
+
+Volumes mounted over NFS (and thus a potentially unreliable network)
+must be mounted with timeouts and applications must be prepared to
+handle network/server failures.
+
+== The Last Line Of Defense
+
+The {timeout}[link:Unicorn/Configurator.html#method-i-timeout] mechanism
+in \Unicorn is an extreme solution that should be avoided whenever
+possible.  It will help catch bugs in your application where and when
+your application forgets to use timeouts, but it is expensive as it
+kills and respawns a worker process.

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v4.1.0.GIT
+DEF_VER=v4.1.1.GIT
 
 LF='
 '

data/lib/unicorn/const.rb

@@ -8,7 +8,7 @@
 # improve things much compared to constants.
 module Unicorn::Const
 
-  UNICORN_VERSION = "4.1.0"
+  UNICORN_VERSION = "4.1.1"
 
   # default TCP listen host address (0.0.0.0, all interfaces)
   DEFAULT_HOST = "0.0.0.0"

data/lib/unicorn/http_server.rb

@@ -264,8 +264,8 @@ class Unicorn::HttpServer
         if (last_check + @timeout) >= (last_check = Time.now)
           sleep_time = murder_lazy_workers
         else
-          # wait for workers to wakeup on suspend
           sleep_time = @timeout/2.0 + 1
+          @logger.debug("waiting #{sleep_time}s after suspend/hibernation")
         end
         maintain_worker_count if respawn
         master_sleep(sleep_time)
@@ -441,23 +441,23 @@ class Unicorn::HttpServer
 
   # forcibly terminate all workers that haven't checked in in timeout seconds.  The timeout is implemented using an unlinked File
   def murder_lazy_workers
-    t = @timeout
-    next_sleep = 1
+    next_sleep = @timeout - 1
     now = Time.now.to_i
     WORKERS.dup.each_pair do |wpid, worker|
       tick = worker.tick
       0 == tick and next # skip workers that are sleeping
       diff = now - tick
-      tmp = t - diff
+      tmp = @timeout - diff
       if tmp >= 0
-        next_sleep < tmp and next_sleep = tmp
+        next_sleep > tmp and next_sleep = tmp
         next
       end
+      next_sleep = 0
       logger.error "worker=#{worker.nr} PID:#{wpid} timeout " \
-                   "(#{diff}s > #{t}s), killing"
+                   "(#{diff}s > #{@timeout}s), killing"
       kill_worker(:KILL, wpid) # take no prisoners for timeout violations
     end
-    next_sleep
+    next_sleep <= 0 ? 1 : next_sleep
   end
 
   def after_fork_internal

data/test/test_helper.rb

@@ -17,11 +17,6 @@ ENV['NO_PROXY'] ||= ENV['UNICORN_TEST_ADDR'] || '127.0.0.1'
 DEFAULT_TRIES = 1000
 DEFAULT_RES = 0.2
 
-HERE = File.dirname(__FILE__) unless defined?(HERE)
-%w(lib ext).each do |dir|
-  $LOAD_PATH.unshift "#{HERE}/../#{dir}"
-end
-
 require 'test/unit'
 require 'net/http'
 require 'digest/sha1'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: unicorn
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 4
   - 1
-  - 0
-  version: 4.1.0
+  - 1
+  version: 4.1.1
 platform: ruby
 authors: 
 - Unicorn hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-20 00:00:00 Z
+date: 2011-08-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -125,10 +125,12 @@ extra_rdoc_files:
 - lib/unicorn/stream_input.rb
 - lib/unicorn/tee_input.rb
 - lib/unicorn/util.rb
+- lib/unicorn/oob_gc.rb
 - lib/unicorn/worker.rb
 - ISSUES
 - Sandbox
 - Links
+- Application_Timeouts
 files: 
 - .CHANGELOG.old
 - .document
@@ -136,6 +138,7 @@ files:
 - .mailmap
 - .manifest
 - .wrongdoc.yml
+- Application_Timeouts
 - CONTRIBUTORS
 - COPYING
 - ChangeLog