rainbows 1.0.0pre1 → 1.0.0

data/.manifest

@@ -164,6 +164,7 @@ t/t0015-working_directory.sh
 t/t0016-onenine-encoding-is-tricky.sh
 t/t0016.rb
 t/t0017-keepalive-timeout-zero.sh
+t/t0018-reload-restore-settings.sh
 t/t0020-large-sendfile-response.sh
 t/t0021-sendfile-wrap-to_path.sh
 t/t0022-copy_stream-byte-range.sh

data/ChangeLog

@@ -1,5 +1,72 @@
-ChangeLog from git://git.bogomips.org/rainbows.git (v0.97.0..v1.0.0pre1)
+ChangeLog from git://git.bogomips.org/rainbows.git (v0.97.0..v1.0.0)
 
+    commit 9f185041fb7af4cda21ba2d547fd4d16d9b2e453
+    Author: Eric Wong <normalperson@yhbt.net>
+    Date:   Thu Oct 28 08:42:09 2010 +0000
+    
+        Rainbows! 1.0.0 - internal cleanups
+        
+        This release is merely a milestone in our evolving internal API.
+        Use of kgio may result in performance improvements under Ruby
+        1.9.2 with non-blocking I/O-intensive workloads.
+        
+        The only bugfix is that SIGHUP reloads restores defaults on
+        unset settings.  A similar fix is included in Unicorn 2.0.0
+        as well.
+    
+    commit 015635f877084cc05a9e6e4c1430c70279d0a04e
+    Author: Eric Wong <normalperson@yhbt.net>
+    Date:   Thu Oct 28 08:40:12 2010 +0000
+    
+        tests: avoid race conditions on reload tests
+        
+        We need to ensure the old worker is really dead before sending
+        requests after reloading.
+    
+    commit b06c6b3ac214bc598d499c994884113d5b106e90
+    Author: Eric Wong <normalperson@yhbt.net>
+    Date:   Thu Oct 28 08:29:53 2010 +0000
+    
+        t0018: wait for old worker to be reaped
+        
+        On busy machines, old workers may not shutdown quickly
+        enough and may still be processing requests.
+    
+    commit f84f138233be0607b0151a5a28c3f9190ba336a2
+    Author: Eric Wong <normalperson@yhbt.net>
+    Date:   Thu Oct 28 08:20:37 2010 +0000
+    
+        rev+event_machine: small cleanups with new parser API
+        
+        These allow for small reductions in the amount of variables
+        we have to manage, more changes coming with later Unicorns.
+    
+    commit c4579db76b9ed5b0286fad852e798e8a890f093c
+    Author: Eric Wong <normalperson@yhbt.net>
+    Date:   Thu Oct 28 02:17:25 2010 +0000
+    
+        HUP reload restores defaults on unset settings
+        
+        For consistency, changed settings are reset back to
+        their default values if they are removed or commented
+        out from the config file.
+    
+    commit 83644e02068311c7ff9cdbc63efd4764d1518138
+    Author: Eric Wong <normalperson@yhbt.net>
+    Date:   Wed Oct 27 23:52:28 2010 +0000
+    
+        use Unicorn 2.0.0 final
+        
+        Unicorn 2.0.0 has CPU wakeup reductions.
+    
+    commit 2b9503566759678c9fbd7b01d1b5f487854208db
+    Author: Eric Wong <normalperson@yhbt.net>
+    Date:   Tue Oct 26 21:36:02 2010 +0000
+    
+        Rakefile: updates for prereleases
+        
+        We do prereleases, now.
+    
     commit a47cd4a7f392a76357ed4f3e458797ae1f9c8f25
     Author: Eric Wong <normalperson@yhbt.net>
     Date:   Tue Oct 26 21:26:03 2010 +0000

data/GIT-VERSION-FILE

@@ -1 +1 @@
-GIT_VERSION = 1.0.0pre1
+GIT_VERSION = 1.0.0

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.0.0pre1.GIT
+DEF_VER=v1.0.0.GIT
 
 LF='
 '

data/NEWS

@@ -1,3 +1,21 @@
+=== 1.0.0 / 2010-10-28 09:01 UTC
+
+  This release is merely a milestone in our evolving internal API.
+  Use of kgio may result in performance improvements under Ruby
+  1.9.2 with non-blocking I/O-intensive workloads.
+
+  The only bugfix is that SIGHUP reloads restores defaults on
+  unset settings.  A similar fix is included in Unicorn 2.0.0
+  as well.
+
+=== 1.0.0pre1 / 2010-10-26 21:33 UTC
+
+  Mostly internal changes for kgio (and Unicorn) integration.
+  There should be no (supported) user-visible changes from
+  Rainbows! 0.97.0.  kgio should improve performance for
+  concurrency models that use non-blocking I/O internally,
+  especially under Ruby 1.9.2
+
 === 0.97.0 / 2010-08-28 19:46 UTC
 
   We now depend on Unicorn 1.1.3 to avoid race conditions during

data/Rakefile

@@ -7,7 +7,7 @@ autoload :Tempfile, 'tempfile'
 def tags
   timefmt = '%Y-%m-%dT%H:%M:%SZ'
   @tags ||= `git tag -l`.split(/\n/).map do |tag|
-    if %r{\Av[\d\.]+\z} =~ tag
+    if %r{\Av[\d\.]+} =~ tag
       header, subject, body = `git cat-file tag #{tag}`.split(/\n\n/, 3)
       header = header.split(/\n/)
       tagger = header.grep(/\Atagger /).first
@@ -192,7 +192,11 @@ task :fm_update do
       "changelog" => changelog,
     },
   }.to_json
-  Net::HTTP.start(uri.host, uri.port) do |http|
-    p http.post(uri.path, req, {'Content-Type'=>'application/json'})
+  if ! changelog.strip.empty? && version =~ %r{\A[\d\.]+\d+\z}
+    Net::HTTP.start(uri.host, uri.port) do |http|
+      p http.post(uri.path, req, {'Content-Type'=>'application/json'})
+    end
+  else
+    warn "not updating freshmeat for v#{version}"
   end
 end

data/lib/rainbows/const.rb

@@ -2,7 +2,7 @@
 # :enddoc:
 module Rainbows::Const
 
-  RAINBOWS_VERSION = '1.0.0pre1'
+  RAINBOWS_VERSION = '1.0.0'
 
   include Unicorn::Const
 

data/lib/rainbows/ev_core.rb

@@ -14,10 +14,10 @@ module Rainbows::EvCore
   ASYNC_CLOSE = "async.close".freeze
 
   def post_init
-    @env = {}
     @hp = HttpParser.new
+    @env = @hp.env
+    @buf = @hp.buf
     @state = :headers # [ :body [ :trailers ] ] :app_call :close
-    @buf = ""
   end
 
   # graceful exit, like SIGQUIT
@@ -47,7 +47,8 @@ module Rainbows::EvCore
   def on_read(data)
     case @state
     when :headers
-      @hp.headers(@env, @buf << data) or return
+      @buf << data
+      @hp.parse or return
       @state = :body
       len = @hp.content_length
       if len == 0

data/lib/rainbows/event_machine.rb

@@ -94,7 +94,6 @@ module Rainbows::EventMachine
       alive = @hp.keepalive? && G.alive && G.kato > 0
       em_write_response(response, alive)
       if alive
-        @env.clear
         @hp.reset
         @state = :headers
         if @buf.empty?

data/lib/rainbows/http_server.rb

@@ -24,8 +24,6 @@ class Rainbows::HttpServer < Unicorn::HttpServer
       G.quit! # let the master reopen and refork us
   end
 
-  #:stopdoc:
-  #
   # Add one second to the timeout since our fchmod heartbeat is less
   # precise (and must be more conservative) than Unicorn does.  We
   # handle many clients per process and can't chmod on every
@@ -35,7 +33,23 @@ class Rainbows::HttpServer < Unicorn::HttpServer
   def timeout=(nr)
     @timeout = nr + 1
   end
-  #:startdoc:
+
+  def load_config!
+    use :Base
+    G.kato = 5
+    Rainbows.max_bytes = 1024 * 1024
+    @worker_connections = nil
+    super
+    @worker_connections ||= Rainbows::MODEL_WORKER_CONNECTIONS[@use]
+  end
+
+  def ready_pipe=(v)
+    # hacky hook got force Rainbows! to load modules only in workers
+    if @master_pid && @master_pid == Process.ppid
+      extend(Rainbows.const_get(@use))
+    end
+    super
+  end
 
   def use(*args)
     model = args.shift or return @use
@@ -49,7 +63,6 @@ class Rainbows::HttpServer < Unicorn::HttpServer
 
     Module === mod or
       raise ArgumentError, "concurrency model #{model.inspect} not supported"
-    extend(mod)
     args.each do |opt|
       case opt
       when Hash; O.update(opt)
@@ -61,11 +74,8 @@ class Rainbows::HttpServer < Unicorn::HttpServer
     new_defaults = {
       'rainbows.model' => (@use = model.to_sym),
       'rack.multithread' => !!(model.to_s =~ /Thread/),
+      'rainbows.autochunk' => [:Rev,:EventMachine,:NeverBlock].include?(@use),
     }
-    case @use
-    when :Rev, :EventMachine, :NeverBlock
-      new_defaults['rainbows.autochunk'] = true
-    end
     Rainbows::Const::RACK_DEFAULTS.update(new_defaults)
   end
 

data/lib/rainbows/never_block.rb

@@ -31,8 +31,11 @@ module Rainbows
         raise ArgumentError, "pool_size must a be an Integer > 0"
       mod = Rainbows.const_get(O[:backend])
       require "never_block" # require EM first since we need a higher version
-      G.server.extend(mod)
-      G.server.extend(Core)
+    end
+
+    def self.extended(klass)
+      klass.extend(Rainbows.const_get(O[:backend])) # EventMachine
+      klass.extend(Core)
     end
 
     module Core  # :nodoc: all

data/lib/rainbows/rev/client.rb

@@ -109,7 +109,6 @@ module Rainbows
 
         rev_write_response(response, alive = @hp.keepalive? && G.alive)
         return quit unless alive && :close != @state
-        @env.clear
         @hp.reset
         @state = :headers
         disable if enabled?
@@ -131,7 +130,7 @@ module Rainbows
         when :close
           close if @_write_buffer.empty?
         when :headers
-          if @hp.headers(@env, @buf)
+          if @hp.parse
             app_call
           else
             unless enabled?

data/lib/rainbows/rev/thread.rb

@@ -24,7 +24,6 @@ module Rainbows
         rev_write_response(response, alive)
         return quit unless alive && :close != @state
 
-        @env.clear
         @hp.reset
         @state = :headers
       end

data/rainbows.gemspec

@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
   s.add_dependency(%q<rack>, ['~> 1.1'])
 
   # we need Unicorn for the HTTP parser and process management
-  s.add_dependency(%q<unicorn>, ["~> 2.0.0pre3"])
+  s.add_dependency(%q<unicorn>, ["~> 2.0.0"])
   s.add_development_dependency(%q<isolate>, "~> 3.0.0")
 
   # optional runtime dependencies depending on configuration

data/t/t0013-reload-bad-config.sh

@@ -29,12 +29,8 @@ t_begin "introduce syntax error in rackup file" && {
 t_begin "reload signal succeeds" && {
 	kill -HUP $rainbows_pid
 	rainbows_wait_start
-	while ! egrep '(done|error) reloading' $r_err >/dev/null
-	do
-		sleep 1
-	done
-
-	grep 'error reloading' $r_err >/dev/null
+	wait_for_reload $r_err error
+	wait_for_reap
 	> $r_err
 }
 

data/t/t0014-config-conflict.sh

@@ -30,12 +30,8 @@ t_begin "modify rackup file" && {
 t_begin "reload signal succeeds" && {
 	kill -HUP $rainbows_pid
 	rainbows_wait_start
-	while ! egrep '(done|error) reloading' < $r_err >/dev/null
-	do
-		sleep 1
-	done
-
-	grep 'done reloading' $r_err >/dev/null
+	wait_for_reload
+	wait_for_reap
 }
 
 t_begin "hit with curl" && {

data/t/t0018-reload-restore-settings.sh

@@ -0,0 +1,53 @@
+#!/bin/sh
+. ./test-lib.sh
+t_plan 8 "reload restore settings for $model"
+
+t_begin "setup and start" && {
+	rtmpfiles orig_config
+	rainbows_setup
+	cat $unicorn_config > $orig_config
+	rainbows -D -c $unicorn_config -l $listen env.ru
+	rainbows_wait_start
+}
+
+t_begin "HTTP request confirms we're running the correct model" && {
+	curl -sSfv http://$listen/ | grep "\"rainbows.model\"=>:$model"
+}
+
+t_begin "clobber config and reload" && {
+	cat > $unicorn_config <<EOF
+stderr_path "$r_err"
+EOF
+	kill -HUP $rainbows_pid
+	wait_for_reload
+	wait_for_reap
+}
+
+t_begin "HTTP request confirms we're on the default model" && {
+	curl -sSfv http://$listen/ | \
+	  grep "\"rainbows.model\"=>:Base" >/dev/null
+}
+
+t_begin "restore config and reload" && {
+	cat $orig_config > $unicorn_config
+	> $r_err
+	kill -HUP $rainbows_pid
+	rainbows_wait_start
+	wait_for_reload
+	wait_for_reap
+}
+
+t_begin "HTTP request confirms we're back on the correct model" && {
+	curl -sSfv http://$listen/ | \
+	  grep "\"rainbows.model\"=>:$model" >/dev/null
+}
+
+t_begin "killing succeeds" && {
+	kill $rainbows_pid
+}
+
+t_begin "check stderr" && {
+	check_stderr
+}
+
+t_done

data/t/test-lib.sh

@@ -148,6 +148,31 @@ rainbows_wait_start () {
 	rainbows_pid=$(cat $pid)
 }
 
+wait_for_reload () {
+	case $# in
+	0) err_log=$r_err status=done ;;
+	1) err_log=$1 status=done ;;
+	2) err_log=$1 status=$2 ;;
+	esac
+	while ! egrep '(done|error) reloading' < $err_log >/dev/null
+	do
+		sleep 1
+	done
+	grep "$status reloading" $err_log >/dev/null
+}
+
+wait_for_reap () {
+	case $# in
+	0) err_log=$r_err ;;
+	1) err_log=$1 ;;
+	esac
+
+	while ! grep reaped < $err_log >/dev/null
+	do
+		sleep 1
+	done
+}
+
 rsha1 () {
 	_cmd="$(which sha1sum 2>/dev/null || :)"
 	test -n "$_cmd" || _cmd="$(which openssl 2>/dev/null || :) sha1"

data/t/test_isolate.rb

@@ -16,7 +16,7 @@ $stdout.reopen($stderr)
 Isolate.now!(opts) do
   gem 'rack', '1.1.0' # Cramp currently requires ~> 1.1.0
   gem 'kgio', '1.3.1'
-  gem 'unicorn', '2.0.0pre3'
+  gem 'unicorn', '2.0.0'
   gem 'kcar', '0.1.1'
 
   if engine == "ruby"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rainbows
 version: !ruby/object:Gem::Version 
-  hash: -766259895
-  prerelease: true
+  hash: 23
+  prerelease: false
   segments: 
   - 1
   - 0
-  - 0pre1
-  version: 1.0.0pre1
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Rainbows! hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 +00:00
+date: 2010-10-28 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,12 +41,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: -766259860
+        hash: 15
         segments: 
         - 2
         - 0
-        - 0pre3
-        version: 2.0.0pre3
+        - 0
+        version: 2.0.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -321,6 +321,7 @@ files:
 - t/t0016-onenine-encoding-is-tricky.sh
 - t/t0016.rb
 - t/t0017-keepalive-timeout-zero.sh
+- t/t0018-reload-restore-settings.sh
 - t/t0020-large-sendfile-response.sh
 - t/t0021-sendfile-wrap-to_path.sh
 - t/t0022-copy_stream-byte-range.sh
@@ -383,14 +384,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: rainbows