rainbows 0.2.0 → 0.3.0

data/t/t1005-thread-pool-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/t1006-thread-pool-async-response-no-autochunk.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+CONFIG_RU=async-response-no-autochunk.ru
+. ./lib-async-response.sh
+test x"$(cat $a)" = x0123456789
+test x"$(cat $b)" = x0123456789
+test x"$(cat $c)" = x0123456789

data/t/t1100-thread-pool-rack-input.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+. ./lib-rack-input-hammer.sh

data/t/t1101-thread-pool-input-trailer.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+. ./lib-input-trailer.sh

data/t/t2000-thread-spawn-basic.sh

@@ -1,38 +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 :ThreadSpawn
-  worker_connections $nr_thread
-end
-EOF
-
-rainbows -D t2000.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" -eq $nr_client
-! grep Error $r_err
+. ./lib-simple-http.sh

data/t/t2002-thread-spawn-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 :ThreadSpawn
-  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/t2003-thread-spawn-reopen-logs.sh

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

data/t/t2004-thread-spawn-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

data/t/t2005-thread-spawn-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/t2006-thread-spawn-async-response-no-autochunk.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+CONFIG_RU=async-response-no-autochunk.ru
+. ./lib-async-response.sh
+test x"$(cat $a)" = x0123456789
+test x"$(cat $b)" = x0123456789
+test x"$(cat $c)" = x0123456789

data/t/t2100-thread-spawn-rack-input.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+. ./lib-rack-input-hammer.sh

data/t/t2101-thread-spawn-input-trailer.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+. ./lib-input-trailer.sh

data/t/t3000-revactor-basic.sh

@@ -1,40 +1,2 @@
 #!/bin/sh
-. ./test-lib.sh
-require_revactor
-
-eval $(unused_listen)
-rtmpfiles unicorn_config curl_out curl_err pid r_err r_out
-
-nr_client=30
-nr_actor=10
-
-cat > $unicorn_config <<EOF
-listen "$listen"
-pid "$pid"
-stderr_path "$r_err"
-stdout_path "$r_out"
-Rainbows! do
-  use :Revactor
-  worker_connections $nr_actor
-end
-EOF
-
-rainbows -D t3000.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" -eq 1
-! grep Error $r_err
+. ./lib-simple-http.sh

data/t/t3002-revactor-graceful.sh

@@ -1,38 +1,2 @@
 #!/bin/sh
-. ./test-lib.sh
-require_revactor
-
-eval $(unused_listen)
-rtmpfiles unicorn_config curl_out curl_err pid r_err r_out
-nr_actor=10
-nr_client=10
-cat > $unicorn_config <<EOF
-listen "$listen"
-stderr_path "$r_err"
-stdout_path "$r_out"
-pid "$pid"
-Rainbows! do
-  use :Revactor
-  worker_connections $nr_actor
-end
-EOF
-
-SLEEP_CLASS=Actor 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/t3003-revactor-reopen-logs.sh

@@ -1,54 +1,2 @@
 #!/bin/sh
-. ./test-lib.sh
-require_revactor
-
-eval $(unused_listen)
-rtmpfiles unicorn_config curl_out curl_err pid r_err r_out r_rot
-
-nr_client=30
-nr_actor=10
-
-cat > $unicorn_config <<EOF
-listen "$listen"
-pid "$pid"
-stderr_path "$r_err"
-stdout_path "$r_out"
-Rainbows! do
-  use :Revactor
-  worker_connections $nr_actor
-end
-EOF
-
-SLEEP_CLASS=Actor 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
-! grep Error $r_err
-
-rm $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
-! grep Error $r_err
-! grep Error $r_rot
-
-kill $(cat $pid)
-dbgcat r_err
-! grep Error $r_err
+. ./lib-reopen-logs.sh

data/t/t3004-revactor-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

data/t/t3005-revactor-large-file-response.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+. ./lib-large-file-response.sh