rainbows 5.0.0.5.ge717 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca864460733b7f19467c85350948190f34dd8063
-  data.tar.gz: bddf103c8b19c4d936e1ff67a939dfe60b63ecf6
+  metadata.gz: b8cc2123c4d83730d582b5f321357fd6137ef00c
+  data.tar.gz: 10d4985653c1dd1d67a69e4947da5ea53044b08c
 SHA512:
-  metadata.gz: c4db9d819af7d582d7dc5eb9b714ea818e5e7d2832073b9a3c60f9c829729acb032b242b9b5939fd5269a511ca4347455510c7ee0ed3a07f69cbf37cc0d8a563
-  data.tar.gz: fb42bee73a9ac1c9893c1866457fd6f4d7570c8cdb62399745588b948feb0b9892c9a9e3c09f4c25f9aa4a2f783382b5813be0d1d58f4cab56a114bca5c4c348
+  metadata.gz: 274906c5e42e82a6ee566776a8a9a2c488cf9c1dca38a415a35355062b02b156bedbe1c617b36bce4264a28ed5cc166867ccb9a3403a61172ef639eab5de06b1
+  data.tar.gz: 16f81b05cdf620fe65ffe76dd266132e89856ccbf45c6f9748e75f2dc45e8e03afc3e586edfc01fbd6ded9d794348b06c5c71126f5dd38e003c6161e77bcd1f1

data/GIT-VERSION-GEN

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-DEF_VER = "v5.0.0"
+DEF_VER = "v5.1.0"
 CONSTANT = "Rainbows::Const::RAINBOWS_VERSION"
 RVF = "lib/rainbows/version.rb"
 GVF = "GIT-VERSION-FILE"

data/README

@@ -159,6 +159,15 @@ don't email the git mailing list or maintainer with \Rainbows! patches.
 There is NO WARRANTY whatsoever if anything goes wrong, but let us know
 and we'll try our best to fix it.
 
+Rainbows! is extremely sensitive to fatal bugs in the apps it hosts.
+Each Rainbows! worker process may be handling thousands of clients;
+unexpectedly killing the process will abort _all_ of those
+connections.  Lives may be lost!
+
+Rainbows! hackers are not responsible for your application/library bugs.
+Use an application server which is tolerant of buggy applications
+if you cannot be bothered to fix all your fatal bugs.
+
 == Contact
 
 All feedback (bug reports, user/development discussion, patches, pull

data/SIGNALS

@@ -24,9 +24,9 @@ between \Rainbows!, unicorn and nginx.
 * INT/TERM - quick shutdown, kills all workers immediately
 
 * QUIT - graceful shutdown, waits for workers to finish their
-  current request before finishing.  This currently does not
-  wait for requests deferred to a separate thread when using
-  EventMachine (when app.deferred?(env) => true)
+  current request before finishing.  Since Rainbows 5.1.0 (Jan 2017),
+  this waits requests deferred to a separate thread with
+  EventMachine (app.deferred?(env) => true).
 
 * USR1 - reopen all logs owned by the master and all workers
   See Unicorn::Util.reopen_logs for what is considered a log.

data/lib/rainbows/configurator.rb

@@ -6,6 +6,11 @@
 # block, otherwise Unicorn::Configurator directives may be used anywhere
 # in the file.
 #
+# Warning: The "timeout" directive in unicorn is far more dangerous
+# in Rainbows!, since ALL requests running on a process will be lost
+# on worker death, not just one.  Instead, handle application-level
+# timeouts yourself: https://bogomips.org/unicorn/Application_Timeouts.html
+#
 #   Rainbows! do
 #     use :ThreadSpawn # concurrency model to use
 #     worker_connections 400

data/lib/rainbows/event_machine.rb

@@ -65,6 +65,11 @@ def em_client_class
     end
   end
 
+  def defers_finished?
+    # EventMachine 1.0.0+ has defers_finished?
+    EM.respond_to?(:defers_finished?) ? EM.defers_finished? : true
+  end
+
   # runs inside each forked worker, this sits around and waits
   # for connections and doesn't die until the parent dies (or is
   # given a INT, QUIT, or TERM signal)
@@ -101,7 +106,10 @@ def worker_loop(worker) # :nodoc:
         end
       end
       EM.add_periodic_timer(1) do
-        EM.stop if ! Rainbows.tick && conns.empty? && EM.reactor_running?
+        if ! Rainbows.tick && conns.empty? && defers_finished? &&
+            EM.reactor_running?
+          EM.stop
+        end
       end
       LISTENERS.map! do |s|
         EM.watch(s, Rainbows::EventMachine::Server) do |c|

data/t/GNUmakefile

@@ -41,6 +41,7 @@ ifeq ($(RUBY_ENGINE),ruby)
     endif
     models += FiberSpawn
     models += FiberPool
+    models += EventMachine
 
     RUBY_LE_2_1 := $(shell $(RUBY) -e 'puts(RUBY_VERSION.to_f <= 2.1)')
     ifeq ($(RUBY_LE_2_1), true)
@@ -48,7 +49,6 @@ ifeq ($(RUBY_ENGINE),ruby)
       models += CoolioThreadPool
       models += CoolioThreadSpawn
       models += CoolioFiberSpawn
-      models += EventMachine
       models += NeverBlock
     endif
   endif

data/t/app_deferred.ru

@@ -6,12 +6,18 @@
 
 class DeferredApp < Struct.new(:app)
   def deferred?(env)
-    env["PATH_INFO"] == "/deferred"
+    env["PATH_INFO"] =~ %r{\A/deferred}
   end
 
   def call(env)
     env["rack.multithread"] or raise RuntimeError, "rack.multithread not true"
     body = "#{Thread.current.inspect}\n"
+    if env["PATH_INFO"] =~ %r{\A/deferred(\d+)}
+      delay = $1.to_i
+      File.open(ENV['fifo'], 'w') { |fp| fp.write "sleeping #{delay}s\n" }
+      body = "deferred sleep\n"
+      sleep(delay)
+    end
     headers = {
       "Content-Type" => "text/plain",
       "Content-Length" => body.size.to_s,

data/t/t0044-autopush.sh

@@ -0,0 +1,121 @@
+#!/bin/sh
+. ./test-lib.sh
+STRACE=$(which strace 2>/dev/null || :)
+if ! test -x "$STRACE"
+then
+	t_info "strace not found, skipping $T"
+	exit 0
+fi
+if test x"$(uname -s)" != xLinux
+then
+	t_info "Linux is the only supported OS for $T"
+	exit 0
+fi
+
+# these buffer internally in external libraries, so we can't detect when
+# to use TCP_CORK
+skip_models EventMachine NeverBlock
+skip_models StreamResponseEpoll
+skip_models Coolio CoolioThreadPool CoolioThreadSpawn
+skip_models Revactor Rev RevThreadPool RevThreadSpawn
+
+# not sure why, but we don't have time to care about Ruby 1.8 too much
+case $RUBY_VERSION in
+1.8.*) skip_models WriterThreadSpawn WriterThreadPool ;;
+esac
+
+t_plan 13 "Kgio autopush tests"
+
+start_strace () {
+	# dbgcat strace_out
+	> $strace_out
+	sleep 1
+	strace -p $worker_pid -e '!futex' -f -o $strace_out &
+	strace_pid=$!
+	while ! test -s $strace_out; do sleep 1; done
+}
+
+check_TCP_CORK () {
+	nr=0
+	while test 2 -gt $(grep TCP_CORK $strace_out | count_lines)
+	do
+		nr=$(( $nr + 1 ))
+		if test $nr -gt 30
+		then
+			dbgcat strace_out
+			die "waited too long ($nr seconds) for TCP_CORK"
+		fi
+		sleep 1
+	done
+
+	test 2 -eq $(grep TCP_CORK $strace_out | count_lines)
+	fgrep 'SOL_TCP, TCP_CORK, [0],' $strace_out
+	fgrep 'SOL_TCP, TCP_CORK, [1],' $strace_out
+}
+
+t_begin "setup and start" && {
+	rainbows_setup $model 1 1
+	rtmpfiles strace_out
+	ed -s $unicorn_config <<EOF
+,s/^listen.*/listen "$listen", :tcp_nodelay => true, :tcp_nopush => true/
+w
+EOF
+	rainbows -D large-file-response.ru -c $unicorn_config -E none
+	rainbows_wait_start
+}
+
+t_begin "read worker pid" && {
+	worker_pid=$(curl -sSf http://$listen/pid)
+	kill -0 $worker_pid
+}
+
+t_begin "start strace on worker" && start_strace
+
+t_begin "reading RSS uncorks" && {
+	curl -sSf http://$listen/rss >/dev/null
+}
+
+t_begin "restart strace on worker" && {
+	kill $strace_pid
+	wait
+	start_strace
+}
+
+t_begin "reading static file uncorks" && {
+	curl -sSf http://$listen/random_blob >/dev/null
+	check_TCP_CORK
+}
+
+t_begin "stop strace on worker" && {
+	kill $strace_pid
+	wait
+}
+
+t_begin "enable sendfile" && {
+	echo >> $unicorn_config 'require "sendfile"'
+	kill -HUP $rainbows_pid
+	test xSTART = x"$(cat $fifo)"
+}
+
+t_begin "reread worker pid" && {
+	worker_pid=$(curl -sSf http://$listen/pid)
+	kill -0 $worker_pid
+}
+
+t_begin "restart strace on the worker" && start_strace
+
+t_begin "HTTP/1.x GET on static file with sendfile uncorks" && {
+	curl -sSf http://$listen/random_blob >/dev/null
+	check_TCP_CORK
+}
+
+t_begin "killing succeeds" && {
+	kill $strace_pid
+	wait
+	# dbgcat strace_out
+	kill $rainbows_pid
+}
+
+t_begin "check stderr" && check_stderr
+
+t_done

data/t/t0700-app-deferred.sh

@@ -15,7 +15,7 @@ CONFIG_RU=app_deferred.ru
 t_begin "setup and start" && {
 	rainbows_setup
 	rtmpfiles deferred_err deferred_out sync_err sync_out
-	rainbows -D -c $unicorn_config $CONFIG_RU
+	fifo=$fifo rainbows -D -c $unicorn_config $CONFIG_RU
 	rainbows_wait_start
 }
 
@@ -36,8 +36,20 @@ t_begin "deferred requests run in a different thread" && {
 	test x"$(uniq < $deferred_out)" != x"$sync_thread"
 }
 
-t_begin "termination signal sent" && {
-	kill $rainbows_pid
+t_begin "deferred requests run after graceful shutdown" && {
+	# XXX sleeping 5s ought to be enough for SIGQUIT to arrive,
+	# hard to tell with overloaded systems...
+	s=5
+	curl -sSf --no-buffer http://$listen/deferred$s \
+		>$deferred_out 2>$deferred_err &
+	curl_pid=$!
+	msg="$(cat $fifo)"
+	kill -QUIT $rainbows_pid
+	test x"$msg" = x"sleeping ${s}s"
+	wait $curl_pid # for curl to finish
+	test $? -eq 0
+	test ! -s $deferred_err
+	test x"$(cat $deferred_out)" = 'xdeferred sleep'
 }
 
 t_begin "no errors in stderr" && check_stderr

data/t/test_isolate.rb

@@ -16,7 +16,7 @@
 lock = File.open(__FILE__, "rb")
 lock.flock(File::LOCK_EX)
 Isolate.now!(opts) do
-  gem 'kgio', '2.10.0'
+  gem 'kgio', '2.11.0'
   gem 'rack', '2.0.1'
   gem 'kcar', '0.6.0'
   gem 'raindrops', '0.17.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rainbows
 version: !ruby/object:Gem::Version
-  version: 5.0.0.5.ge717
+  version: 5.1.0
 platform: ruby
 authors:
 - Rainbows! hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2017-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -387,6 +387,7 @@ files:
 - t/t0041-optional-pool-size.sh
 - t/t0042-client_header_buffer_size.sh
 - t/t0043-quit-keepalive-disconnect.sh
+- t/t0044-autopush.sh
 - t/t0045-client_max_header_size.sh
 - t/t0050-response-body-close-has-env.sh
 - t/t0100-rack-input-hammer-chunked.sh
@@ -447,12 +448,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: "- unicorn for sleepy apps and slow clients"