[master] 4b4bb1aa8 Try to fix c98 and c99 the same way.
Poul-Henning Kamp
phk at FreeBSD.org
Tue Apr 23 21:11:07 UTC 2019
commit 4b4bb1aa884be8320a1af5cd7a215f5d2b308e08
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Tue Apr 23 21:09:32 2019 +0000
Try to fix c98 and c99 the same way.
The trick here is that these tests depend on c1 getting in front of
c2... and that cannot be assumed given random thread scheduling algorithms,
it must be enforced with barriers
diff --git a/bin/varnishtest/tests/c00098.vtc b/bin/varnishtest/tests/c00098.vtc
index af5fff417..32a809766 100644
--- a/bin/varnishtest/tests/c00098.vtc
+++ b/bin/varnishtest/tests/c00098.vtc
@@ -1,6 +1,7 @@
varnishtest "Hit-for-pass and waitinglist rushing"
barrier b2 cond 6
+barrier b3 cond 6
server s1 {
rxreq
@@ -80,30 +81,36 @@ varnish v1 -arg "-p thread_pool_min=20" -arg "-p rush_exponent=2" -arg "-p debug
client c1 {
txreq -url /hfp -hdr "Client: 1"
- rxresp
+ rxresp -no_obj
+ barrier b3 sync
} -start
client c2 {
+ barrier b3 sync
txreq -url /hfp -hdr "Client: 2"
rxresp
} -start
client c3 {
+ barrier b3 sync
txreq -url /hfp -hdr "Client: 3"
rxresp
} -start
client c4 {
+ barrier b3 sync
txreq -url /hfp -hdr "Client: 4"
rxresp
} -start
client c5 {
+ barrier b3 sync
txreq -url /hfp -hdr "Client: 5"
rxresp
} -start
client c6 {
+ barrier b3 sync
txreq -url /hfp -hdr "Client: 6"
rxresp
} -start
diff --git a/bin/varnishtest/tests/c00099.vtc b/bin/varnishtest/tests/c00099.vtc
index f05681b91..58363ffc3 100644
--- a/bin/varnishtest/tests/c00099.vtc
+++ b/bin/varnishtest/tests/c00099.vtc
@@ -1,6 +1,7 @@
varnishtest "Hit-for-miss and waitinglist rushing"
barrier b3 cond 6
+barrier b4 cond 6
server s1 {
rxreq
@@ -80,30 +81,36 @@ varnish v1 -arg "-p thread_pool_min=20" -arg "-p rush_exponent=2" -arg "-p debug
client c1 {
txreq -url /hfm -hdr "Client: 1"
- rxresp
+ rxresp -no_obj
+ barrier b4 sync
} -start
client c2 {
+ barrier b4 sync
txreq -url /hfm -hdr "Client: 2"
rxresp
} -start
client c3 {
+ barrier b4 sync
txreq -url /hfm -hdr "Client: 3"
rxresp
} -start
client c4 {
+ barrier b4 sync
txreq -url /hfm -hdr "Client: 4"
rxresp
} -start
client c5 {
+ barrier b4 sync
txreq -url /hfm -hdr "Client: 5"
rxresp
} -start
client c6 {
+ barrier b4 sync
txreq -url /hfm -hdr "Client: 6"
rxresp
} -start
More information about the varnish-commit
mailing list