[6.0] 69483e434 Try to make the proxy code session workspace overflow test on 32bit

Martin Blix Grydeland martin at varnish-software.com
Tue Feb 4 10:02:08 UTC 2020


commit 69483e434bb23e5176526aafe937d4220f511a1b
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Thu Nov 28 11:19:08 2019 +0100

    Try to make the proxy code session workspace overflow test on 32bit
    
    Ref varnishcache/varnish-cache#3145 / 287dc4a6745c374e0b229bfa861d664989a3a9e8
    
    (cherry picked from commit e1a57eb7a7350ac4c8a0235dc991bef400b118c1)

diff --git a/bin/varnishtest/tests/o00005.vtc b/bin/varnishtest/tests/o00005.vtc
index d84b92d4d..2ac11d1a8 100644
--- a/bin/varnishtest/tests/o00005.vtc
+++ b/bin/varnishtest/tests/o00005.vtc
@@ -249,10 +249,16 @@ delay 1
 
 varnish v1 -expect ws_session_overflow == 1
 
-# error handling elsewhere in the proxy code
-# request is the same as initial
-
-varnish v1 -cliok "param.set workspace_session 450"
+# workspace overflow handling elsewhere in the proxy code
+#
+# the workspace_session size is chosen to fail as closely as possible
+# below the minimum required value for the vtc to work (= the
+# workspace to overflow) both on 64 and 32 bit.
+#
+# This value is fragile, ideally we would want something like
+# vtc.alloc(-x), yet there is no vcl code being run before we parse
+# proxy headers
+varnish v1 -cliok "param.set workspace_session 410"
 varnish v1 -cliok "param.set pool_sess 10,100,1"
 
 delay 1


More information about the varnish-commit mailing list