[master] b703b6b Rewrite for more robust handling of server write failures

Poul-Henning Kamp phk at FreeBSD.org
Sun May 17 11:40:04 CEST 2015


commit b703b6b379058faae06721203c9b14236d090d90
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sun May 17 09:39:40 2015 +0000

    Rewrite for more robust handling of server write failures

diff --git a/bin/varnishtest/tests/c00046.vtc b/bin/varnishtest/tests/c00046.vtc
index 3abea2f..b5baf91 100644
--- a/bin/varnishtest/tests/c00046.vtc
+++ b/bin/varnishtest/tests/c00046.vtc
@@ -3,10 +3,6 @@ varnishtest	"Object/LRU/Stevedores with hinting and body alloc failures"
 server s1 {
 	rxreq
 	txresp -bodylen 1000000
-	rxreq
-	txresp -bodylen 1000001
-	rxreq
-	txresp -bodylen 1000002
 } -start
 
 varnish v1 \
@@ -35,6 +31,12 @@ varnish v1 -expect SMA.s1.g_space > 1000000
 varnish v1 -expect SMA.s2.g_bytes == 0
 varnish v1 -expect SMA.s2.g_space > 1000000
 
+server s1 -wait {
+	rxreq
+	non-fatal
+	txresp -bodylen 1000001
+} -start
+
 client c1 {
 	txreq -url /bar
 	rxresp
@@ -51,6 +53,12 @@ varnish v1 -expect SMA.s1.g_space > 1000000
 varnish v1 -expect SMA.s2.g_bytes == 0
 varnish v1 -expect SMA.s2.g_space > 1000000
 
+server s1 -wait {
+	rxreq
+	# non-fatal
+	txresp -bodylen 1000002
+} -start
+
 client c1 {
 	txreq -url /foo
 	rxresp



More information about the varnish-commit mailing list