Use a new regression test log from varnish post 7.3

varnishd now uses 64bit vxids and a new VSL format, with some tags
removed.

I did ponder to write a VSL log converter or come up with some other
deliverate way to somehow preserve the old log data in a regerssion
log in the new format.

But ultimately, it all seemed pretty much wasted effort. Let's just
start with a new log and regression test future changes.

I must admit that I only hat a bit of a superficial look at the log
files, but as we made no changes at all to varnishevent, I do not see
how they could have changed fundamentally.

varnish-post-7.3.README.rst cotains information on how the log was
created.
parent 332aff65
...@@ -34,7 +34,7 @@ fi ...@@ -34,7 +34,7 @@ fi
EVENT_LOG=$TMP/event.log EVENT_LOG=$TMP/event.log
NCSA_LOG=$TMP/ncsa.log NCSA_LOG=$TMP/ncsa.log
INPUT=varnish-4.1.0-doc.log INPUT=varnish-post-7.3.vsl
echo "... default format" echo "... default format"
$EVENT -r $INPUT | sed 's/-//g' > $EVENT_LOG $EVENT -r $INPUT | sed 's/-//g' > $EVENT_LOG
......
...@@ -13,10 +13,10 @@ OUT=output.log ...@@ -13,10 +13,10 @@ OUT=output.log
rm -f $LOG $OUT rm -f $LOG $OUT
../varnishevent -f varnishevent.conf -r varnish-4.1.0-doc.log -w $OUT -v ../varnishevent -f varnishevent.conf -r varnish-post-7.3.vsl -w $OUT -v
CKSUM=$( cksum $OUT ) CKSUM=$( cksum $OUT )
if [ "$CKSUM" != "4160992159 443944 $OUT" ]; then if [ "$CKSUM" != "759017242 658582 $OUT" ]; then
echo "ERROR: Regression test log output incorrect cksum: $CKSUM" echo "ERROR: Regression test log output incorrect cksum: $CKSUM"
exit 1 exit 1
fi fi
...@@ -27,7 +27,7 @@ fi ...@@ -27,7 +27,7 @@ fi
# predictable from one run to the next. # predictable from one run to the next.
CKSUM=$( sed -e 's/\(initializing\) \(.*\)/\1/' $LOG | egrep -v 'Writer: returned|Reader: took|^DEBUG: Allocating' | cksum ) CKSUM=$( sed -e 's/\(initializing\) \(.*\)/\1/' $LOG | egrep -v 'Writer: returned|Reader: took|^DEBUG: Allocating' | cksum )
if [ "$CKSUM" != '1109151867 836995' ]; then if [ "$CKSUM" != '1540502566 1261931' ]; then
echo "ERROR: Regression test varnishevent log incorrect cksum: $CKSUM" echo "ERROR: Regression test varnishevent log incorrect cksum: $CKSUM"
exit 1 exit 1
fi fi
......
This log file was created as follows:
* built varnish-cache documentation::
cd $VARNISHSRC
make html
* copied the resulting html to the docroot of a debian vanilla nginx::
cp -r doc/sphinx/build/html/* /var/www/html
* started varnishd with the nginx as a backend::
/tmp/sbin/varnishd -b 127.0.0.1:80 -a 127.0.0.1:8080 -n /tmp/v
* crawled the entire content with wget
mkdir /tmp/scratch
cd /tmp/scratch
wget -r -l 99 http://localhost:8080
* dumped the entire VSM:
/tmp/bin/varnishlog -n /tmp/v -d -g raw -w varnish-post-7.3.vsl
Version used:
$ /tmp/sbin/varnishd -V
varnishd (varnish-trunk revision a84b3c9416890a3f32e25ce4f6d6c87e40b10c79)
...@@ -25,13 +25,13 @@ bformat+=%{X-Forwarded-For}i %{X-Varnish}i %{Accept-Ranges}o %{Connection}o ...@@ -25,13 +25,13 @@ bformat+=%{X-Forwarded-For}i %{X-Varnish}i %{Accept-Ranges}o %{Connection}o
bformat+=%{Content-Encoding}o %{Content-Length}o %{Content-Type}o %{Date}o bformat+=%{Content-Encoding}o %{Content-Length}o %{Content-Type}o %{Date}o
bformat+=%{ETag}o %{Last-Modified}o %{Server}o %{Transfer-Encoding}o %{Vary}o bformat+=%{ETag}o %{Last-Modified}o %{Server}o %{Transfer-Encoding}o %{Vary}o
bformat+=%l %m %O %q %r %s %t %{%F-%T}t %U %u %{Varnish:time_firstbyte}x bformat+=%l %m %O %q %r %s %t %{%F-%T}t %U %u %{Varnish:time_firstbyte}x
bformat+=%{tag:Backend}x %{tag:BackendOpen}x %{tag:BackendClose}x bformat+=%{tag:BackendOpen}x %{tag:BackendClose}x
bformat+=%{tag:BackendReuse}x %{tag:Begin}x %{tag:BereqAcct}x %{tag:Length}x bformat+=%{tag:Begin}x %{tag:BereqAcct}x %{tag:Length}x
bformat+=%{tag:BerespProtocol}x %{tag:BerespReason}x %{tag:BerespStatus}x bformat+=%{tag:BerespProtocol}x %{tag:BerespReason}x %{tag:BerespStatus}x
bformat+=%{tag:BereqProtocol}x %{tag:BereqMethod}x %{tag:BereqURL}x bformat+=%{tag:BereqProtocol}x %{tag:BereqMethod}x %{tag:BereqURL}x
bformat+=%{tag:Debug}x %{tag:End}x %{tag:Timestamp:Bereq}x %{tag:BereqAcct[5]}x bformat+=%{tag:Debug}x %{tag:End}x %{tag:Timestamp:Bereq}x %{tag:BereqAcct[5]}x
bformat+=%{tag:Timestamp:Bereq[2]}x %{VSL:Backend}x %{VSL:BackendOpen}x bformat+=%{tag:Timestamp:Bereq[2]}x %{VSL:BackendOpen}x
bformat+=%{VSL:BackendClose}x %{VSL:BackendReuse}x %{VSL:Begin}x bformat+=%{VSL:BackendClose}x %{VSL:Begin}x
bformat+=%{VSL:BereqAcct}x %{VSL:Length}x %{VSL:BerespProtocol}x bformat+=%{VSL:BereqAcct}x %{VSL:Length}x %{VSL:BerespProtocol}x
bformat+=%{VSL:BerespReason}x %{VSL:BerespStatus}x %{VSL:BereqProtocol}x bformat+=%{VSL:BerespReason}x %{VSL:BerespStatus}x %{VSL:BereqProtocol}x
bformat+=%{VSL:BereqMethod}x %{VSL:BereqURL}x %{VSL:Debug}x %{VSL:End}x bformat+=%{VSL:BereqMethod}x %{VSL:BereqURL}x %{VSL:Debug}x %{VSL:End}x
......
805680033 830 vslarg.sh.trc.dash-C 830793803 1890 vslarg.sh.trc.dash-C
3453409010 443982 vslarg.sh.trc.no 84438628 658620 vslarg.sh.trc.no
805680033 830 vslarg.sh.trc.query 830793803 1890 vslarg.sh.trc.query
3267477005 21053 vslarg.sh.trc.raw 341992910 24339 vslarg.sh.trc.raw
16969574 444977 vslarg.sh.trc.request 3861372615 659333 vslarg.sh.trc.request
3453409010 443982 vslarg.sh.trc.vxid 84438628 658620 vslarg.sh.trc.vxid
...@@ -4,7 +4,7 @@ echo ...@@ -4,7 +4,7 @@ echo
echo "TEST: $0" echo "TEST: $0"
echo "... testing standard VSL args" echo "... testing standard VSL args"
IN=varnish-4.1.0-doc.log IN=varnish-post-7.3.vsl
CONF=varnishevent.conf CONF=varnishevent.conf
LOG=/dev/null LOG=/dev/null
TRC=$(basename $0).trc TRC=$(basename $0).trc
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment