rainbows 0.2.0 → 0.3.0

data/t/lib-large-file-response.sh

@@ -0,0 +1,45 @@
+. ./test-lib.sh
+test -r random_blob || die "random_blob required, run with 'make $0'"
+if ! grep -v ^VmRSS: /proc/self/status >/dev/null 2>&1
+then
+	echo >&2 "skipping, can't read RSS from /proc/self/status"
+	exit 0
+fi
+echo "large file response slurp avoidance for model=$model"
+eval $(unused_listen)
+rtmpfiles unicorn_config tmp r_err r_out pid ok
+
+cat > $unicorn_config <<EOF
+listen "$listen"
+stderr_path "$r_err"
+stdout_path "$r_out"
+pid "$pid"
+Rainbows! { use :$model }
+EOF
+
+# can't load Rack::Lint here since it'll cause Rev to slurp
+rainbows -E none -D large-file-response.ru -c $unicorn_config
+wait_for_pid $pid
+
+random_blob_size=$(wc -c < random_blob)
+curl -v http://$listen/rss
+dbgcat r_err
+rss_before=$(curl -sSfv http://$listen/rss)
+echo "rss_before=$rss_before"
+
+for i in a b c
+do
+	size=$( (curl -sSfv http://$listen/random_blob && echo ok > $ok) | wc -c)
+	test $size -eq $random_blob_size
+	test xok = x$(cat $ok)
+done
+
+dbgcat r_err
+curl -v http://$listen/rss
+rss_after=$(curl -sSfv http://$listen/rss)
+echo "rss_after=$rss_after"
+diff=$(( $rss_after - $rss_before ))
+echo "test diff=$diff < orig=$random_blob_size"
+kill -QUIT $(cat $pid)
+test $diff -le $random_blob_size
+dbgcat r_err

data/t/lib-parser-error.sh

@@ -0,0 +1,29 @@
+. ./test-lib.sh
+echo "parser error test for model=$model"
+
+eval $(unused_listen)
+rtmpfiles unicorn_config pid r_err r_out tmp fifo ok
+
+cat > $unicorn_config <<EOF
+listen "$listen"
+pid "$pid"
+stderr_path "$r_err"
+stdout_path "$r_out"
+Rainbows! { use :$model }
+EOF
+
+rainbows -D env.ru -c $unicorn_config
+wait_for_pid $pid
+
+(
+	printf 'GET / HTTP/1/1\r\nHost: example.com\r\n\r\n'
+	cat $fifo > $tmp &
+	wait
+	echo ok > $ok
+) | socat - TCP:$listen > $fifo
+
+kill $(cat $pid)
+
+dbgcat tmp
+grep -F 'HTTP/1.1 400 Bad Request' $tmp
+check_stderr

data/t/{t3100-revactor-tee-input.sh → lib-rack-input-hammer.sh}

@@ -1,9 +1,5 @@
-#!/bin/sh
-nr_client=${nr_client-25}
-nr_actor=${nr_actor-50}
-
+nr_client=${nr_client-4}
 . ./test-lib.sh
-require_revactor
 test -r random_blob || die "random_blob required, run with 'make $0'"
 
 eval $(unused_listen)
@@ -15,12 +11,10 @@ pid "$pid"
 stderr_path "$r_err"
 stdout_path "$r_out"
 Rainbows! do
-  use :Revactor
-  worker_connections $nr_actor
+  use :$model
 end
 EOF
 
-echo pid=$pid
 rainbows -D sha1.ru -c $unicorn_config
 wait_for_pid $pid
 
@@ -41,4 +35,4 @@ test 1 -eq $(sort < $curl_out | uniq | wc -l)
 blob_sha1=$( expr "$(sha1sum < random_blob)" : '\([a-f0-9]\+\)')
 echo blob_sha1=$blob_sha1
 test x"$blob_sha1" = x"$(sort < $curl_out | uniq)"
-! grep Error $r_err
+check_stderr

data/t/lib-reopen-logs.sh

@@ -0,0 +1,60 @@
+#!/bin/sh
+# don't set nr_client for Rev, only _one_ app running at once :x
+nr_client=${nr_client-2}
+. ./test-lib.sh
+
+eval $(unused_listen)
+rtmpfiles unicorn_config curl_out curl_err pid r_err r_out r_rot
+
+
+cat > $unicorn_config <<EOF
+listen "$listen"
+pid "$pid"
+stderr_path "$r_err"
+stdout_path "$r_out"
+Rainbows! { use :$model }
+EOF
+
+rainbows -D sleep.ru -c $unicorn_config
+wait_for_pid $pid
+
+start=$(date +%s)
+for i in $(awk "BEGIN{for(i=0;i<$nr_client;++i) print i}" </dev/null)
+do
+	( curl -sSf http://$listen/2 >> $curl_out 2>> $curl_err ) &
+done
+check_stderr
+
+rm -f $r_rot
+mv $r_err $r_rot
+
+kill -USR1 $(cat $pid)
+wait_for_pid $r_err
+
+dbgcat r_rot
+dbgcat r_err
+
+wait
+echo elapsed=$(( $(date +%s) - $start ))
+test ! -s $curl_err
+test x"$(wc -l < $curl_out)" = x$nr_client
+nr=$(sort < $curl_out | uniq | wc -l)
+
+test "$nr" -eq 1
+test x$(sort < $curl_out | uniq) = xHello
+check_stderr
+check_stderr $r_rot
+
+before_rot=$(wc -c < $r_rot)
+before_err=$(wc -c < $r_err)
+curl -sSfv http://$listen/
+after_rot=$(wc -c < $r_rot)
+after_err=$(wc -c < $r_err)
+
+test $after_rot -eq $before_rot && echo "before_rot -eq after_rot"
+test $after_err -gt $before_err && echo "before_err -gt after_err"
+
+kill $(cat $pid)
+dbgcat r_err
+check_stderr
+check_stderr $r_rot

data/t/lib-simple-http.sh

@@ -0,0 +1,92 @@
+#!/bin/sh
+. ./test-lib.sh
+
+echo "simple HTTP connection keepalive/pipelining tests for $model"
+
+tbase=$(expr "$T" : '^\(t....\)-').ru
+test -f "$tbase" || die "$tbase missing for $T"
+
+eval $(unused_listen)
+rtmpfiles unicorn_config pid r_err r_out tmp fifo ok
+
+cat > $unicorn_config <<EOF
+listen "$listen"
+pid "$pid"
+stderr_path "$r_err"
+stdout_path "$r_out"
+EOF
+if test x$model != xany
+then
+	echo "Rainbows! { use :$model }" >> $unicorn_config
+fi
+
+rainbows -D $tbase -c $unicorn_config
+wait_for_pid $pid
+
+echo "single request"
+curl -sSfv http://$listen/
+dbgcat r_err
+
+echo "two requests with keepalive"
+curl -sSfv http://$listen/a http://$listen/b > $tmp 2>&1
+dbgcat r_err
+dbgcat tmp
+grep 'Re-using existing connection' < $tmp
+
+echo "pipelining partial requests"
+req='GET / HTTP/1.1\r\nHost: example.com\r\n'
+(
+	printf "$req"'\r\n'"$req"
+	cat $fifo > $tmp &
+	sleep 1
+	printf 'Connection: close\r\n\r\n'
+	wait
+	echo ok > $ok
+) | socat - TCP:$listen > $fifo
+
+dbgcat tmp
+
+test 2 -eq $(grep '^HTTP/1.1' $tmp | wc -l)
+test 2 -eq $(grep '^HTTP/1.1 200 OK' $tmp | wc -l)
+test 1 -eq $(grep '^Connection: keep-alive' $tmp | wc -l)
+test 1 -eq $(grep '^Connection: close' $tmp | wc -l)
+test x"$(cat $ok)" = xok
+check_stderr
+
+
+echo "burst pipelining"
+req='GET / HTTP/1.1\r\nHost: example.com\r\n'
+(
+	printf "$req"'\r\n'"$req"'Connection: close\r\n\r\n'
+	cat $fifo > $tmp &
+	wait
+	echo ok > $ok
+) | socat - TCP:$listen > $fifo
+
+dbgcat tmp
+dbgcat r_err
+
+test 2 -eq $(grep '^HTTP/1.1' $tmp | wc -l)
+test 2 -eq $(grep '^HTTP/1.1 200 OK' $tmp | wc -l)
+test 1 -eq $(grep '^Connection: keep-alive' $tmp | wc -l)
+test 1 -eq $(grep '^Connection: close' $tmp | wc -l)
+test x"$(cat $ok)" = xok
+
+check_stderr
+
+echo "HTTP/0.9 request should not return headers"
+(
+	printf 'GET /\r\n\r\n'
+	cat $fifo > $tmp &
+	wait
+	echo ok > $ok
+) | socat - TCP:$listen > $fifo
+
+dbgcat tmp
+dbgcat r_err
+echo "env.inspect should've put everything on one line"
+test 1 -eq $(wc -l < $tmp)
+! grep ^Connection: $tmp
+! grep ^HTTP/ $tmp
+
+kill $(cat $pid)

data/t/sleep.ru

@@ -1,11 +1,18 @@
 use Rack::ContentLength
-use Rack::ContentType
-sleep_class = ENV['SLEEP_CLASS']
-sleep_class = sleep_class ? Object.const_get(sleep_class) : Kernel
-$stderr.puts "sleep_class=#{sleep_class.inspect}"
+
 run lambda { |env|
+  /\A100-continue\z/i =~ env['HTTP_EXPECT'] and return [ 100, {}, [] ]
+
+  env['rack.input'].read
   nr = 1
   env["PATH_INFO"] =~ %r{/([\d\.]+)\z} and nr = $1.to_f
-  sleep_class.sleep(nr)
-  [ 200, {}, [ "Hello\n" ] ]
+
+  (case env['rainbows.model']
+  when :Revactor
+    Actor
+  else
+    Kernel
+  end).sleep(nr)
+
+  [ 200, {'Content-Type' => 'text/plain'}, [ "Hello\n" ] ]
 }

data/t/t0000-basic.sh

@@ -1,37 +1,2 @@
 #!/bin/sh
-. ./test-lib.sh
-
-eval $(unused_listen)
-rtmpfiles pid tmp ok fifo
-
-rm -f $fifo
-mkfifo $fifo
-
-rainbows -D t0000.ru -l $listen --pid $pid &
-wait_for_pid $pid
-
-echo "single request"
-curl -sSfv http://$listen/
-
-echo "two requests with keepalive"
-curl -sSfv http://$listen/a http://$listen/b > $tmp 2>&1
-grep 'Re-using existing connection' < $tmp
-
-echo "pipelining partial requests"
-req='GET / HTTP/1.1\r\nHost: foo\r\n'
-(
-	printf "$req"'\r\n'"$req"
-	cat $fifo > $tmp &
-	sleep 1
-	printf 'Connection: close\r\n\r\n'
-	echo ok > $ok
-) | socat - TCP:$listen > $fifo
-
-kill $(cat $pid)
-
-# sed -ne 's/^/------/p' < $tmp
-test 2 -eq $(grep '^HTTP/1.1' $tmp | wc -l)
-test 2 -eq $(grep '^HTTP/1.1 200 OK' $tmp | wc -l)
-test 1 -eq $(grep '^Connection: keep-alive' $tmp | wc -l)
-test 1 -eq $(grep '^Connection: close' $tmp | wc -l)
-test x"$(cat $ok)" = xok
+. ./lib-simple-http.sh

data/t/t1000-thread-pool-basic.sh

@@ -1,42 +1,2 @@
 #!/bin/sh
-. ./test-lib.sh
-
-eval $(unused_listen)
-rtmpfiles unicorn_config curl_out curl_err pid r_err r_out
-
-nr_client=30
-nr_thread=10
-
-cat > $unicorn_config <<EOF
-stderr_path "$r_err"
-stdout_path "$r_out"
-listen "$listen"
-pid "$pid"
-Rainbows! do
-  use :ThreadPool
-  worker_connections $nr_thread
-end
-EOF
-
-rainbows -D t1000.ru -c $unicorn_config
-wait_for_pid $pid
-
-start=$(date +%s)
-for i in $(awk "BEGIN{for(i=0;i<$nr_client;++i) print i}" </dev/null)
-do
-	( curl -sSf http://$listen/$i >> $curl_out 2>> $curl_err ) &
-done
-wait
-echo elapsed=$(( $(date +%s) - $start ))
-
-kill $(cat $pid)
-
-! test -s $curl_err
-test x"$(wc -l < $curl_out)" = x$nr_client
-
-nr=$(sort < $curl_out | uniq | wc -l)
-
-test "$nr" -le $nr_thread
-test "$nr" -gt 1
-
-! grep Error $r_err
+. ./lib-simple-http.sh

data/t/t1002-thread-pool-graceful.sh

@@ -1,37 +1,2 @@
 #!/bin/sh
-. ./test-lib.sh
-
-eval $(unused_listen)
-rtmpfiles unicorn_config curl_out curl_err pid r_err r_out
-nr_thread=10
-nr_client=10
-cat > $unicorn_config <<EOF
-listen "$listen"
-stderr_path "$r_err"
-stdout_path "$r_out"
-pid "$pid"
-Rainbows! do
-  use :ThreadPool
-  worker_connections $nr_thread
-end
-EOF
-
-rainbows -D sleep.ru -c $unicorn_config
-wait_for_pid $pid
-
-for i in $(awk "BEGIN{for(i=0;i<$nr_client;++i) print i}" </dev/null)
-do
-	curl -sSf http://$listen/5 >> $curl_out 2>> $curl_err &
-done
-sleep 2
-kill -QUIT $(cat $pid)
-wait
-
-dbgcat r_err
-! test -s $curl_err
-test x"$(wc -l < $curl_out)" = x$nr_client
-nr=$(sort < $curl_out | uniq | wc -l)
-
-test "$nr" -eq 1
-test x$(sort < $curl_out | uniq) = xHello
-! grep Error $r_err
+. ./lib-graceful.sh

data/t/t1003-thread-pool-reopen-logs.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+. ./lib-reopen-logs.sh

data/t/t1004-thread-pool-async-response.sh

@@ -0,0 +1,45 @@
+CONFIG_RU=${CONFIG_RU-'async-response.ru'}
+. ./test-lib.sh
+echo "async response for model=$model"
+eval $(unused_listen)
+rtmpfiles unicorn_config a b c r_err r_out pid curl_err
+
+cat > $unicorn_config <<EOF
+listen "$listen"
+stderr_path "$r_err"
+stdout_path "$r_out"
+pid "$pid"
+Rainbows! { use :$model }
+EOF
+
+# can't load Rack::Lint here since it'll cause Rev to slurp
+rainbows -E none -D $CONFIG_RU -c $unicorn_config
+wait_for_pid $pid
+
+t0=$(date +%s)
+( curl --no-buffer -sSf http://$listen/ 2>> $curl_err | utee $a) &
+( curl --no-buffer -sSf http://$listen/ 2>> $curl_err | utee $b) &
+( curl --no-buffer -sSf http://$listen/ 2>> $curl_err | utee $c) &
+wait
+t1=$(date +%s)
+
+rainbows_pid=$(cat $pid)
+kill -QUIT $rainbows_pid
+elapsed=$(( $t1 - $t0 ))
+echo "elapsed=$elapsed < 30"
+test $elapsed -lt 30
+
+dbgcat a
+dbgcat b
+dbgcat c
+dbgcat r_err
+dbgcat curl_err
+test ! -s $curl_err
+check_stderr
+
+while kill -0 $rainbows_pid >/dev/null 2>&1
+do
+	sleep 1
+done
+
+dbgcat r_err