r4770 - in branches/2.1: . varnish-cache/bin/varnishd varnish-cache/bin/varnishtest varnish-cache/bin/varnishtest/tests varnish-cache/include varnish-cache/lib/libvarnish varnish-cache/lib/libvcl
tfheen at varnish-cache.org
tfheen at varnish-cache.org
Wed May 5 10:38:16 CEST 2010
Author: tfheen
Date: 2010-05-05 10:38:16 +0200 (Wed, 05 May 2010)
New Revision: 4770
Modified:
branches/2.1/
branches/2.1/varnish-cache/bin/varnishd/cache_backend.h
branches/2.1/varnish-cache/bin/varnishd/cache_backend_cfg.c
branches/2.1/varnish-cache/bin/varnishd/vparam.h
branches/2.1/varnish-cache/bin/varnishtest/tests/b00000.vtc
branches/2.1/varnish-cache/bin/varnishtest/tests/c00019.vtc
branches/2.1/varnish-cache/bin/varnishtest/tests/p00000.vtc
branches/2.1/varnish-cache/bin/varnishtest/tests/p00001.vtc
branches/2.1/varnish-cache/bin/varnishtest/tests/p00002.vtc
branches/2.1/varnish-cache/bin/varnishtest/tests/p00003.vtc
branches/2.1/varnish-cache/bin/varnishtest/tests/p00004.vtc
branches/2.1/varnish-cache/bin/varnishtest/tests/p00005.vtc
branches/2.1/varnish-cache/bin/varnishtest/tests/p00006.vtc
branches/2.1/varnish-cache/bin/varnishtest/tests/r00325.vtc
branches/2.1/varnish-cache/bin/varnishtest/tests/r00416.vtc
branches/2.1/varnish-cache/bin/varnishtest/tests/v00010.vtc
branches/2.1/varnish-cache/bin/varnishtest/tests/v00011.vtc
branches/2.1/varnish-cache/bin/varnishtest/vtc_varnish.c
branches/2.1/varnish-cache/include/vct.h
branches/2.1/varnish-cache/include/vev.h
branches/2.1/varnish-cache/lib/libvarnish/tcp.c
branches/2.1/varnish-cache/lib/libvarnish/vev.c
branches/2.1/varnish-cache/lib/libvcl/vcc_dir_random.c
Log:
Merge r4750: Add -storage spec to varnishtest
Introduce a -storage spec, and default it -sfile,<workdir>,10m to
avoid mapping more VM than a 32bit machine can cope with, if /tmp is
huge.
Property changes on: branches/2.1
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:4637,4640,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4757-4758,4762
+ /trunk:4637,4640,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762
Property changes on: branches/2.1/varnish-cache/bin/varnishd/cache_backend.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishd/cache_backend.h:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4757-4758,4762
+ /trunk/varnish-cache/bin/varnishd/cache_backend.h:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762
Property changes on: branches/2.1/varnish-cache/bin/varnishd/cache_backend_cfg.c
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishd/cache_backend_cfg.c:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4757-4758,4762
+ /trunk/varnish-cache/bin/varnishd/cache_backend_cfg.c:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762
Property changes on: branches/2.1/varnish-cache/bin/varnishd/vparam.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishd/vparam.h:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4757-4758,4762
+ /trunk/varnish-cache/bin/varnishd/vparam.h:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762
Modified: branches/2.1/varnish-cache/bin/varnishtest/tests/b00000.vtc
===================================================================
--- branches/2.1/varnish-cache/bin/varnishtest/tests/b00000.vtc 2010-05-05 08:28:04 UTC (rev 4769)
+++ branches/2.1/varnish-cache/bin/varnishtest/tests/b00000.vtc 2010-05-05 08:38:16 UTC (rev 4770)
@@ -9,7 +9,7 @@
txresp -body "012345\n"
} -start
-varnish v1 -arg "-smalloc,1m" -vcl+backend {} -start
+varnish v1 -storage "-smalloc,1m" -vcl+backend {} -start
varnish v1 -cliok "param.set diag_bitmap 0x2"
Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/c00019.vtc
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishtest/tests/c00019.vtc:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4757-4758,4762
+ /trunk/varnish-cache/bin/varnishtest/tests/c00019.vtc:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762
Modified: branches/2.1/varnish-cache/bin/varnishtest/tests/p00000.vtc
===================================================================
--- branches/2.1/varnish-cache/bin/varnishtest/tests/p00000.vtc 2010-05-05 08:28:04 UTC (rev 4769)
+++ branches/2.1/varnish-cache/bin/varnishtest/tests/p00000.vtc 2010-05-05 08:38:16 UTC (rev 4770)
@@ -11,7 +11,8 @@
varnish v1 \
-arg "-pdiag_bitmap=0x20000" \
- -arg "-spersistent,${tmpdir}/_.per,10m" -vcl+backend { } -start
+ -storage "-spersistent,${tmpdir}/_.per,10m" \
+ -vcl+backend { } -start
varnish v1 -stop
Modified: branches/2.1/varnish-cache/bin/varnishtest/tests/p00001.vtc
===================================================================
--- branches/2.1/varnish-cache/bin/varnishtest/tests/p00001.vtc 2010-05-05 08:28:04 UTC (rev 4769)
+++ branches/2.1/varnish-cache/bin/varnishtest/tests/p00001.vtc 2010-05-05 08:38:16 UTC (rev 4770)
@@ -11,7 +11,8 @@
varnish v1 \
-arg "-pdiag_bitmap=0x20000" \
- -arg "-spersistent,${tmpdir}/_.per,10m" -vcl+backend { } -start
+ -storage "-spersistent,${tmpdir}/_.per,10m" \
+ -vcl+backend { } -start
client c1 {
txreq -url "/"
Modified: branches/2.1/varnish-cache/bin/varnishtest/tests/p00002.vtc
===================================================================
--- branches/2.1/varnish-cache/bin/varnishtest/tests/p00002.vtc 2010-05-05 08:28:04 UTC (rev 4769)
+++ branches/2.1/varnish-cache/bin/varnishtest/tests/p00002.vtc 2010-05-05 08:38:16 UTC (rev 4770)
@@ -11,8 +11,8 @@
varnish v1 \
-arg "-pdiag_bitmap=0x20000" \
- -arg "-spersistent,${tmpdir}/_.per1,10m" \
- -arg "-spersistent,${tmpdir}/_.per2,10m" \
+ -storage "-spersistent,${tmpdir}/_.per1,10m" \
+ -storage "-spersistent,${tmpdir}/_.per2,10m" \
-vcl+backend { } -start
client c1 {
Modified: branches/2.1/varnish-cache/bin/varnishtest/tests/p00003.vtc
===================================================================
--- branches/2.1/varnish-cache/bin/varnishtest/tests/p00003.vtc 2010-05-05 08:28:04 UTC (rev 4769)
+++ branches/2.1/varnish-cache/bin/varnishtest/tests/p00003.vtc 2010-05-05 08:38:16 UTC (rev 4770)
@@ -11,7 +11,7 @@
varnish v1 \
-arg "-pdiag_bitmap=0x20000" \
- -arg "-spersistent,${tmpdir}/_.per,10m" \
+ -storage "-spersistent,${tmpdir}/_.per,10m" \
-vcl+backend { } -start
varnish v1 -cliok purge.list
Modified: branches/2.1/varnish-cache/bin/varnishtest/tests/p00004.vtc
===================================================================
--- branches/2.1/varnish-cache/bin/varnishtest/tests/p00004.vtc 2010-05-05 08:28:04 UTC (rev 4769)
+++ branches/2.1/varnish-cache/bin/varnishtest/tests/p00004.vtc 2010-05-05 08:38:16 UTC (rev 4770)
@@ -13,7 +13,7 @@
varnish v1 \
-arg "-pdiag_bitmap=0x20000" \
- -arg "-spersistent,${tmpdir}/_.per,10m" \
+ -storage "-spersistent,${tmpdir}/_.per,10m" \
-vcl+backend { } -start
client c1 {
Modified: branches/2.1/varnish-cache/bin/varnishtest/tests/p00005.vtc
===================================================================
--- branches/2.1/varnish-cache/bin/varnishtest/tests/p00005.vtc 2010-05-05 08:28:04 UTC (rev 4769)
+++ branches/2.1/varnish-cache/bin/varnishtest/tests/p00005.vtc 2010-05-05 08:38:16 UTC (rev 4770)
@@ -11,7 +11,7 @@
varnish v1 \
-arg "-pdiag_bitmap=0x30000" \
- -arg "-spersistent,${tmpdir}/_.per,10m" \
+ -storage "-spersistent,${tmpdir}/_.per,10m" \
-vcl+backend {
sub vcl_fetch {
set beresp.ttl = 3s;
Modified: branches/2.1/varnish-cache/bin/varnishtest/tests/p00006.vtc
===================================================================
--- branches/2.1/varnish-cache/bin/varnishtest/tests/p00006.vtc 2010-05-05 08:28:04 UTC (rev 4769)
+++ branches/2.1/varnish-cache/bin/varnishtest/tests/p00006.vtc 2010-05-05 08:38:16 UTC (rev 4770)
@@ -13,7 +13,7 @@
varnish v1 \
- -arg "-spersistent,${tmpdir}/_.per,10m" \
+ -storage "-spersistent,${tmpdir}/_.per,10m" \
-vcl+backend { } -start
client c1 {
Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/r00325.vtc
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishtest/tests/r00325.vtc:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4757-4758,4762
+ /trunk/varnish-cache/bin/varnishtest/tests/r00325.vtc:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762
Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/r00416.vtc
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishtest/tests/r00416.vtc:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4757-4758,4762
+ /trunk/varnish-cache/bin/varnishtest/tests/r00416.vtc:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762
Modified: branches/2.1/varnish-cache/bin/varnishtest/tests/v00010.vtc
===================================================================
--- branches/2.1/varnish-cache/bin/varnishtest/tests/v00010.vtc 2010-05-05 08:28:04 UTC (rev 4769)
+++ branches/2.1/varnish-cache/bin/varnishtest/tests/v00010.vtc 2010-05-05 08:38:16 UTC (rev 4770)
@@ -13,7 +13,7 @@
txresp -hdr "Foo: foo" -body "abcdef\n"
} -start
-varnish v1 -arg "-smalloc,1m" -vcl+backend {
+varnish v1 -storage "-smalloc,1m" -vcl+backend {
sub vcl_fetch {
if (beresp.http.panic) {
Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/v00011.vtc
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishtest/tests/v00011.vtc:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4757-4758,4762
+ /trunk/varnish-cache/bin/varnishtest/tests/v00011.vtc:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762
Modified: branches/2.1/varnish-cache/bin/varnishtest/vtc_varnish.c
===================================================================
--- branches/2.1/varnish-cache/bin/varnishtest/vtc_varnish.c 2010-05-05 08:28:04 UTC (rev 4769)
+++ branches/2.1/varnish-cache/bin/varnishtest/vtc_varnish.c 2010-05-05 08:38:16 UTC (rev 4770)
@@ -33,6 +33,7 @@
#include <stdio.h>
+#include <limits.h>
#include <ctype.h>
#include <fcntl.h>
#include <stdlib.h>
@@ -68,6 +69,8 @@
struct varnish_stats *stats;
+ struct vsb *storage;
+
struct vsb *args;
int fds[4];
pid_t pid;
@@ -171,9 +174,15 @@
vtc_log(v->vl, 0, "Varnish name must start with 'v'");
v->args = vsb_newauto();
+
+ v->storage = vsb_newauto();
+ vsb_printf(v->storage, "-sfile,%s,10M", v->workdir);
+ vsb_finish(v->storage);
+
v->cli_fd = -1;
VTAILQ_INSERT_TAIL(&varnishes, v, list);
+
return (v);
}
@@ -269,6 +278,7 @@
vsb_printf(vsb, " -S %s/_S", v->workdir);
vsb_printf(vsb, " -M %s:%s", abuf, pbuf);
vsb_printf(vsb, " -P %s/varnishd.pid", v->workdir);
+ vsb_printf(vsb, " %s", vsb_data(v->storage));
vsb_printf(vsb, " %s", vsb_data(v->args));
vsb_finish(vsb);
AZ(vsb_overflowed(vsb));
@@ -663,6 +673,13 @@
for (; *av != NULL; av++) {
if (vtc_error)
break;
+ if (!strcmp(*av, "-storage")) {
+ vsb_clear(v->storage);
+ vsb_cat(v->storage, av[1]);
+ vsb_finish(v->storage);
+ av++;
+ continue;
+ }
if (!strcmp(*av, "-arg")) {
AN(av[1]);
AZ(v->pid);
Property changes on: branches/2.1/varnish-cache/include/vct.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/include/vct.h:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4757-4758,4762
+ /trunk/varnish-cache/include/vct.h:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762
Property changes on: branches/2.1/varnish-cache/include/vev.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/include/vev.h:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4757-4758,4762
+ /trunk/varnish-cache/include/vev.h:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762
Property changes on: branches/2.1/varnish-cache/lib/libvarnish/tcp.c
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/lib/libvarnish/tcp.c:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4757-4758,4762
+ /trunk/varnish-cache/lib/libvarnish/tcp.c:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762
Property changes on: branches/2.1/varnish-cache/lib/libvarnish/vev.c
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/lib/libvarnish/vev.c:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4757-4758,4762
+ /trunk/varnish-cache/lib/libvarnish/vev.c:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762
Property changes on: branches/2.1/varnish-cache/lib/libvcl/vcc_dir_random.c
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/lib/libvcl/vcc_dir_random.c:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4757-4758,4762
+ /trunk/varnish-cache/lib/libvcl/vcc_dir_random.c:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762
More information about the varnish-commit
mailing list