[master] 189b60f6d vtc: Stabilize r1941

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Fri Aug 5 11:42:06 UTC 2022


commit 189b60f6d3e5aa070d8c05ca4bd05e48c0e20be1
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Fri Aug 5 13:35:24 2022 +0200

    vtc: Stabilize r1941
    
    Under load, the backend connection may not be back in the pool by the
    time the ESI fetch starts.
    
    Also check the expected storage allocation failure happened.

diff --git a/bin/varnishtest/tests/r01941.vtc b/bin/varnishtest/tests/r01941.vtc
index 2561bf1fc..74b8b0507 100644
--- a/bin/varnishtest/tests/r01941.vtc
+++ b/bin/varnishtest/tests/r01941.vtc
@@ -9,6 +9,9 @@ server s1 {
 	rxreq
 	expect req.url == /big
 	txresp -bodylen 1037480
+
+	expect_close
+	accept
 	rxreq
 	txresp -nolen -hdr "Content-Length: 6545" -body "<html>"
 	loop 92 {
@@ -17,6 +20,9 @@ server s1 {
 		send { />}
 	}
 	send "</html>"
+
+	expect_close
+	accept
 	rxreq
 	expect req.url == /long1234567890123456789012345678901234567890.txt
 	txresp -body {fo}
@@ -25,6 +31,9 @@ server s1 {
 varnish v1 -arg "-pfetch_chunksize=4k" \
 	-arg "-p feature=+esi_disable_xml_check" \
 	-arg "-sdefault,1m" -vcl+backend {
+	sub vcl_backend_fetch {
+		set bereq.http.connection = "close";
+	}
 	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
@@ -34,6 +43,9 @@ client c1 {
 	txreq -url /big
 	rxresp
 	expect resp.bodylen == 1037480
-	txreq -url /
+
+	txreq
 	rxresp
 } -run
+
+varnish v1 -expect SM?.s0.c_fail == 1


More information about the varnish-commit mailing list