unicorn 1.1.1 → 1.1.2

data/GIT-VERSION-GEN

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

data/lib/unicorn.rb

@@ -313,6 +313,11 @@ module Unicorn
       if path
         if x = valid_pid?(path)
           return path if pid && path == pid && x == $$
+          if x == reexec_pid && pid =~ /\.oldbin\z/
+            logger.warn("will not set pid=#{path} while reexec-ed "\
+                        "child is running PID:#{x}")
+            return
+          end
           raise ArgumentError, "Already running on PID:#{x} " \
                                "(or pid=#{path} is stale)"
         end

data/lib/unicorn/const.rb

@@ -8,8 +8,8 @@ module Unicorn
   # Symbols did not really improve things much compared to constants.
   module Const
 
-    # The current version of Unicorn, currently 1.1.1
-    UNICORN_VERSION="1.1.1"
+    # The current version of Unicorn, currently 1.1.2
+    UNICORN_VERSION="1.1.2"
 
     DEFAULT_HOST = "0.0.0.0" # default TCP listen host address
     DEFAULT_PORT = 8080      # default TCP listen port

data/lib/unicorn/launcher.rb

@@ -24,11 +24,7 @@ module Unicorn::Launcher
 
     # We only start a new process group if we're not being reexecuted
     # and inheriting file descriptors from our parent
-    if ENV['UNICORN_FD']
-      exit if fork
-      Process.setsid
-      exit if fork
-    else
+    unless ENV['UNICORN_FD']
       # grandparent - reads pipe, exits when master is ready
       #  \_ parent  - exits immediately ASAP
       #      \_ unicorn master - writes to pipe when ready

data/t/pid.ru

@@ -0,0 +1,3 @@
+use Rack::ContentLength
+use Rack::ContentType, "text/plain"
+run lambda { |env| [ 200, {}, [ "#$$\n" ] ] }

data/t/t0008-back_out_of_upgrade.sh

@@ -0,0 +1,110 @@
+#!/bin/sh
+. ./test-lib.sh
+t_plan 13 "backout of USR2 upgrade"
+
+worker_wait_start () {
+	test xSTART = x"$(cat $fifo)"
+	unicorn_pid=$(cat $pid)
+}
+
+t_begin "setup and start" && {
+	unicorn_setup
+	rm -f $pid.oldbin
+
+cat >> $unicorn_config <<EOF
+after_fork do |server, worker|
+  # test script will block while reading from $fifo,
+  # so notify the script on the first worker we spawn
+  # by opening the FIFO
+  if worker.nr == 0
+    File.open("$fifo", "wb") { |fp| fp.syswrite "START" }
+  end
+end
+EOF
+	unicorn -D -c $unicorn_config pid.ru
+	worker_wait_start
+	orig_master_pid=$unicorn_pid
+}
+
+t_begin "read original worker pid" && {
+	orig_worker_pid=$(curl -sSf http://$listen/)
+	test -n "$orig_worker_pid" && kill -0 $orig_worker_pid
+}
+
+t_begin "upgrade to new master" && {
+	kill -USR2 $orig_master_pid
+}
+
+t_begin "kill old worker" && {
+	kill -WINCH $orig_master_pid
+}
+
+t_begin "wait for new worker to start" && {
+	worker_wait_start
+	test $unicorn_pid -ne $orig_master_pid
+	new_master_pid=$unicorn_pid
+}
+
+t_begin "old master pid is stashed in $pid.oldbin" && {
+	test -s "$pid.oldbin"
+	test $orig_master_pid -eq $(cat $pid.oldbin)
+}
+
+t_begin "ensure old worker is no longer running" && {
+	i=0
+	while kill -0 $orig_worker_pid 2>/dev/null
+	do
+		i=$(( $i + 1 ))
+		test $i -lt 600 || die "timed out"
+		sleep 1
+	done
+}
+
+t_begin "capture pid of new worker" && {
+	new_worker_pid=$(curl -sSf http://$listen/)
+}
+
+t_begin "reload old master process" && {
+	kill -HUP $orig_master_pid
+	worker_wait_start
+}
+
+t_begin "gracefully kill new master and ensure it dies" && {
+	kill -QUIT $new_master_pid
+	i=0
+	while kill -0 $new_worker_pid 2>/dev/null
+	do
+		i=$(( $i + 1 ))
+		test $i -lt 600 || die "timed out"
+		sleep 1
+	done
+}
+
+t_begin "ensure $pid.oldbin does not exist" && {
+	i=0
+	while test -s $pid.oldbin
+	do
+		i=$(( $i + 1 ))
+		test $i -lt 600 || die "timed out"
+		sleep 1
+	done
+	while ! test -s $pid
+	do
+		i=$(( $i + 1 ))
+		test $i -lt 600 || die "timed out"
+		sleep 1
+	done
+}
+
+t_begin "ensure $pid is correct" && {
+	cur_master_pid=$(cat $pid)
+	test $orig_master_pid -eq $cur_master_pid
+}
+
+t_begin "killing succeeds" && {
+	kill $orig_master_pid
+}
+
+dbgcat r_err
+
+t_done

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: unicorn
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Unicorn hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-11 00:00:00 +00:00
+date: 2010-07-13 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -169,6 +169,7 @@ files:
 - t/bin/utee
 - t/env.ru
 - t/my-tap-lib.sh
+- t/pid.ru
 - t/rails3-app/.gitignore
 - t/rails3-app/Gemfile
 - t/rails3-app/Rakefile
@@ -209,6 +210,7 @@ files:
 - t/t0006-reopen-logs.sh
 - t/t0006.ru
 - t/t0007-working_directory_no_embed_cli.sh
+- t/t0008-back_out_of_upgrade.sh
 - t/t0300-rails3-basic.sh
 - t/t0301-rails3-missing-config-ru.sh
 - t/t0302-rails3-alt-working_directory.sh