[master] ccaf588 Reduce the size of the persistent stevedores we create.
Poul-Henning Kamp
phk at FreeBSD.org
Fri Nov 25 21:53:04 CET 2016
commit ccaf588bc55ae6267a364060dd8348d4c51c62b6
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Fri Nov 25 20:51:42 2016 +0000
Reduce the size of the persistent stevedores we create.
diff --git a/bin/varnishtest/tests/p00000.vtc b/bin/varnishtest/tests/p00000.vtc
index 9e68fcd..a2cdc2c 100644
--- a/bin/varnishtest/tests/p00000.vtc
+++ b/bin/varnishtest/tests/p00000.vtc
@@ -12,7 +12,7 @@ shell "rm -f ${tmpdir}/_.per"
varnish v1 \
-arg "-pfeature=+wait_silo" \
- -arg "-sdeprecated_persistent,${tmpdir}/_.per,10m" \
+ -arg "-sdeprecated_persistent,${tmpdir}/_.per,5m" \
-vcl+backend { } -start
varnish v1 -stop
diff --git a/bin/varnishtest/tests/p00002.vtc b/bin/varnishtest/tests/p00002.vtc
index e60c8a6..44d6c26 100644
--- a/bin/varnishtest/tests/p00002.vtc
+++ b/bin/varnishtest/tests/p00002.vtc
@@ -10,8 +10,8 @@ server s1 {
varnish v1 \
-arg "-pfeature=+wait_silo" \
-arg "-pban_lurker_sleep=0" \
- -arg "-sdeprecated_persistent,${tmpdir}/_.per1,10m" \
- -arg "-sdeprecated_persistent,${tmpdir}/_.per2,10m" \
+ -arg "-sdeprecated_persistent,${tmpdir}/_.per1,5m" \
+ -arg "-sdeprecated_persistent,${tmpdir}/_.per2,5m" \
-vcl+backend { } -start
client c1 {
diff --git a/bin/varnishtest/tests/p00003.vtc b/bin/varnishtest/tests/p00003.vtc
index 98984df..1367fe8 100644
--- a/bin/varnishtest/tests/p00003.vtc
+++ b/bin/varnishtest/tests/p00003.vtc
@@ -9,7 +9,7 @@ server s1 {
varnish v1 \
-arg "-pfeature=+wait_silo" \
- -arg "-sdeprecated_persistent,${tmpdir}/_.per,10m" \
+ -arg "-sdeprecated_persistent,${tmpdir}/_.per,5m" \
-arg "-pban_lurker_sleep=0" \
-vcl+backend { } -start
diff --git a/bin/varnishtest/tests/p00004.vtc b/bin/varnishtest/tests/p00004.vtc
index a908913..4e7326f 100644
--- a/bin/varnishtest/tests/p00004.vtc
+++ b/bin/varnishtest/tests/p00004.vtc
@@ -11,7 +11,7 @@ server s1 {
varnish v1 \
-arg "-pfeature=+wait_silo" \
- -arg "-sdeprecated_persistent,${tmpdir}/_.per,10m" \
+ -arg "-sdeprecated_persistent,${tmpdir}/_.per,5m" \
-arg "-pban_lurker_sleep=0" \
-vcl+backend { } -start
diff --git a/bin/varnishtest/tests/p00005.vtc b/bin/varnishtest/tests/p00005.vtc
index de6f3c3..7d46d40 100644
--- a/bin/varnishtest/tests/p00005.vtc
+++ b/bin/varnishtest/tests/p00005.vtc
@@ -8,7 +8,7 @@ server s1 {
} -start
varnish v1 \
- -arg "-sdeprecated_persistent,${tmpdir}/_.per,10m" \
+ -arg "-sdeprecated_persistent,${tmpdir}/_.per,5m" \
-arg "-pban_lurker_sleep=0" \
-arg "-pshortlived=0" \
-vcl+backend {
diff --git a/bin/varnishtest/tests/p00006.vtc b/bin/varnishtest/tests/p00006.vtc
index 605a88d..38e2993 100644
--- a/bin/varnishtest/tests/p00006.vtc
+++ b/bin/varnishtest/tests/p00006.vtc
@@ -11,7 +11,7 @@ server s1 {
varnish v1 \
- -arg "-sdeprecated_persistent,${tmpdir}/_.per,10m" \
+ -arg "-sdeprecated_persistent,${tmpdir}/_.per,5m" \
-arg "-pcli_timeout=60" \
-arg "-pban_lurker_sleep=0" \
-vcl+backend { } -start
diff --git a/bin/varnishtest/tests/p00007.vtc b/bin/varnishtest/tests/p00007.vtc
index a7c232a..7cb0743 100644
--- a/bin/varnishtest/tests/p00007.vtc
+++ b/bin/varnishtest/tests/p00007.vtc
@@ -27,7 +27,7 @@ server s1 {
txresp -bodylen 48
} -start
-varnish v1 -arg "-sdeprecated_persistent,${tmpdir}/_.per,10m" \
+varnish v1 -arg "-sdeprecated_persistent,${tmpdir}/_.per,5m" \
-vcl+backend {} -start
varnish v1 -cliok "debug.fragfetch 32"
diff --git a/bin/varnishtest/tests/p00008.vtc b/bin/varnishtest/tests/p00008.vtc
index fb55acb..a17c17c 100644
--- a/bin/varnishtest/tests/p00008.vtc
+++ b/bin/varnishtest/tests/p00008.vtc
@@ -16,8 +16,8 @@ server s1 {
varnish v1 \
-arg "-pfeature=+wait_silo" \
-arg "-pban_lurker_sleep=0" \
- -arg "-sper1=deprecated_persistent,${tmpdir}/_.per1,10m" \
- -arg "-sper2=deprecated_persistent,${tmpdir}/_.per2,10m" \
+ -arg "-sper1=deprecated_persistent,${tmpdir}/_.per1,5m" \
+ -arg "-sper2=deprecated_persistent,${tmpdir}/_.per2,5m" \
-vcl+backend {
sub vcl_backend_response {
set beresp.storage = storage.per1;
@@ -45,7 +45,7 @@ server s1 -wait
varnish v2 \
-arg "-pfeature=+wait_silo" \
-arg "-pban_lurker_sleep=0" \
- -arg "-sdeprecated_persistent,${tmpdir}/_.per1,10m" \
+ -arg "-sdeprecated_persistent,${tmpdir}/_.per1,5m" \
-vcl+backend { } -start
varnish v2 -cliok "ban obj.http.x-foo == foo"
varnish v2 -cliok "ban.list"
@@ -56,8 +56,8 @@ varnish v2 -stop
varnish v3 \
-arg "-pfeature=+wait_silo" \
-arg "-pban_lurker_sleep=0" \
- -arg "-sdeprecated_persistent,${tmpdir}/_.per1,10m" \
- -arg "-sdeprecated_persistent,${tmpdir}/_.per2,10m" \
+ -arg "-sdeprecated_persistent,${tmpdir}/_.per1,5m" \
+ -arg "-sdeprecated_persistent,${tmpdir}/_.per2,5m" \
-vcl+backend { } -start
varnish v3 -cliok "ban.list"
varnish v3 -stop
@@ -72,7 +72,7 @@ server s1 {
varnish v4 \
-arg "-pfeature=+wait_silo" \
-arg "-pban_lurker_sleep=0" \
- -arg "-sdeprecated_persistent,${tmpdir}/_.per2,10m" \
+ -arg "-sdeprecated_persistent,${tmpdir}/_.per2,5m" \
-vcl+backend { } -start
client c1 -connect ${v4_sock} {
txreq -url "/silo2"
diff --git a/bin/varnishtest/tests/p00009.vtc b/bin/varnishtest/tests/p00009.vtc
index 21d65a6..184beca 100644
--- a/bin/varnishtest/tests/p00009.vtc
+++ b/bin/varnishtest/tests/p00009.vtc
@@ -14,8 +14,8 @@ server s1 {
varnish v1 \
-arg "-pfeature=+wait_silo" \
-arg "-pban_lurker_sleep=0" \
- -arg "-sper1=deprecated_persistent,${tmpdir}/_.per1,10m" \
- -arg "-sper2=deprecated_persistent,${tmpdir}/_.per2,10m" \
+ -arg "-sper1=deprecated_persistent,${tmpdir}/_.per1,5m" \
+ -arg "-sper2=deprecated_persistent,${tmpdir}/_.per2,5m" \
-vcl+backend {
}
varnish v1 -start
diff --git a/bin/varnishtest/tests/r00915.vtc b/bin/varnishtest/tests/r00915.vtc
index 3e1528c..1add7cd 100644
--- a/bin/varnishtest/tests/r00915.vtc
+++ b/bin/varnishtest/tests/r00915.vtc
@@ -9,7 +9,7 @@ shell "rm -f ${tmpdir}/_.per"
varnish v1 \
-arg "-pfeature=+wait_silo" \
- -arg "-sdeprecated_persistent,${tmpdir}/_.per,10m" \
+ -arg "-sdeprecated_persistent,${tmpdir}/_.per,5m" \
-vcl+backend {
sub vcl_backend_response {
diff --git a/bin/varnishtest/tests/r00962.vtc b/bin/varnishtest/tests/r00962.vtc
index dccf0af..4d0ec7e 100644
--- a/bin/varnishtest/tests/r00962.vtc
+++ b/bin/varnishtest/tests/r00962.vtc
@@ -14,8 +14,8 @@ shell "rm -f ${tmpdir}/_.per?"
varnish v1 \
-arg "-pfeature=+wait_silo" \
- -arg "-sdeprecated_persistent,${tmpdir}/_.per1,10m" \
- -arg "-sdeprecated_persistent,${tmpdir}/_.per2,10m" \
+ -arg "-sdeprecated_persistent,${tmpdir}/_.per1,5m" \
+ -arg "-sdeprecated_persistent,${tmpdir}/_.per2,5m" \
-vcl+backend {
sub vcl_backend_response {
set beresp.storage = storage.s0;
@@ -46,8 +46,8 @@ server s1 {
varnish v2 \
-arg "-pfeature=+wait_silo" \
- -arg "-sdeprecated_persistent,${tmpdir}/_.per2,10m" \
- -arg "-sdeprecated_persistent,${tmpdir}/_.per1,10m" \
+ -arg "-sdeprecated_persistent,${tmpdir}/_.per2,5m" \
+ -arg "-sdeprecated_persistent,${tmpdir}/_.per1,5m" \
-vcl+backend { } -start
client c1 -connect ${v2_sock} {
diff --git a/bin/varnishtest/tests/r01225.vtc b/bin/varnishtest/tests/r01225.vtc
index 85cc418..2cbf448 100644
--- a/bin/varnishtest/tests/r01225.vtc
+++ b/bin/varnishtest/tests/r01225.vtc
@@ -10,7 +10,7 @@ server s1 {
varnish v1 \
-arg "-pfeature=+wait_silo" \
- -arg "-sdeprecated_persistent,${tmpdir}/_.per,10m" \
+ -arg "-sdeprecated_persistent,${tmpdir}/_.per,5m" \
-arg "-pban_lurker_sleep=0.01" \
-vcl+backend { } -start
diff --git a/bin/varnishtest/tests/r01266.vtc b/bin/varnishtest/tests/r01266.vtc
index bf4bf42..3d20685 100644
--- a/bin/varnishtest/tests/r01266.vtc
+++ b/bin/varnishtest/tests/r01266.vtc
@@ -12,7 +12,7 @@ server s1 {
varnish v1 \
-arg "-pfeature=+wait_silo" \
-arg "-pban_lurker_sleep=0.01" \
- -arg "-sper1=deprecated_persistent,${tmpdir}/_.per1,10m" \
+ -arg "-sper1=deprecated_persistent,${tmpdir}/_.per1,5m" \
-vcl+backend {
}
varnish v1 -start
More information about the varnish-commit
mailing list