r3742 - in branches/2.0/varnish-cache: bin/varnishd bin/varnishtest/tests include
tfheen at projects.linpro.no
tfheen at projects.linpro.no
Wed Feb 11 08:53:47 CET 2009
Author: tfheen
Date: 2009-02-11 08:53:47 +0100 (Wed, 11 Feb 2009)
New Revision: 3742
Modified:
branches/2.0/varnish-cache/bin/varnishd/cache_vrt_esi.c
branches/2.0/varnish-cache/bin/varnishtest/tests/e00000.vtc
branches/2.0/varnish-cache/bin/varnishtest/tests/e00001.vtc
branches/2.0/varnish-cache/bin/varnishtest/tests/e00002.vtc
branches/2.0/varnish-cache/bin/varnishtest/tests/e00003.vtc
branches/2.0/varnish-cache/bin/varnishtest/tests/e00004.vtc
branches/2.0/varnish-cache/bin/varnishtest/tests/e00005.vtc
branches/2.0/varnish-cache/bin/varnishtest/tests/e00006.vtc
branches/2.0/varnish-cache/bin/varnishtest/tests/e00007.vtc
branches/2.0/varnish-cache/bin/varnishtest/tests/e00008.vtc
branches/2.0/varnish-cache/bin/varnishtest/tests/e00009.vtc
branches/2.0/varnish-cache/bin/varnishtest/tests/e00010.vtc
branches/2.0/varnish-cache/bin/varnishtest/tests/e00011.vtc
branches/2.0/varnish-cache/bin/varnishtest/tests/e00012.vtc
branches/2.0/varnish-cache/bin/varnishtest/tests/e00013.vtc
branches/2.0/varnish-cache/bin/varnishtest/tests/e00014.vtc
branches/2.0/varnish-cache/include/stat_field.h
Log:
Merge r3573: Add a counter for esi parse errors and test it in all ESI related tests cases.
Modified: branches/2.0/varnish-cache/bin/varnishd/cache_vrt_esi.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/cache_vrt_esi.c 2009-02-11 07:49:21 UTC (rev 3741)
+++ branches/2.0/varnish-cache/bin/varnishd/cache_vrt_esi.c 2009-02-11 07:53:47 UTC (rev 3742)
@@ -95,6 +95,7 @@
char buf[256], *q;
txt t;
+ VSL_stats->esi_errors++;
if (i == 0)
i = p - ew->t.b;
if (i > 20) {
Modified: branches/2.0/varnish-cache/bin/varnishtest/tests/e00000.vtc
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/e00000.vtc 2009-02-11 07:49:21 UTC (rev 3741)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/e00000.vtc 2009-02-11 07:53:47 UTC (rev 3742)
@@ -24,3 +24,4 @@
}
client c1 -run
+varnish v1 -expect esi_errors == 0
Modified: branches/2.0/varnish-cache/bin/varnishtest/tests/e00001.vtc
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/e00001.vtc 2009-02-11 07:49:21 UTC (rev 3741)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/e00001.vtc 2009-02-11 07:53:47 UTC (rev 3742)
@@ -27,3 +27,4 @@
}
client c1 -run
+varnish v1 -expect esi_errors == 0
Modified: branches/2.0/varnish-cache/bin/varnishtest/tests/e00002.vtc
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/e00002.vtc 2009-02-11 07:49:21 UTC (rev 3741)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/e00002.vtc 2009-02-11 07:53:47 UTC (rev 3742)
@@ -28,3 +28,4 @@
}
client c1 -run
+varnish v1 -expect esi_errors == 0
Modified: branches/2.0/varnish-cache/bin/varnishtest/tests/e00003.vtc
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/e00003.vtc 2009-02-11 07:49:21 UTC (rev 3741)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/e00003.vtc 2009-02-11 07:53:47 UTC (rev 3742)
@@ -32,3 +32,4 @@
}
client c1 -run
+varnish v1 -expect esi_errors == 0
Modified: branches/2.0/varnish-cache/bin/varnishtest/tests/e00004.vtc
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/e00004.vtc 2009-02-11 07:49:21 UTC (rev 3741)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/e00004.vtc 2009-02-11 07:53:47 UTC (rev 3742)
@@ -32,3 +32,4 @@
}
client c1 -run
+varnish v1 -expect esi_errors == 0
Modified: branches/2.0/varnish-cache/bin/varnishtest/tests/e00005.vtc
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/e00005.vtc 2009-02-11 07:49:21 UTC (rev 3741)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/e00005.vtc 2009-02-11 07:53:47 UTC (rev 3742)
@@ -33,3 +33,4 @@
}
client c1 -run
+varnish v1 -expect esi_errors == 0
Modified: branches/2.0/varnish-cache/bin/varnishtest/tests/e00006.vtc
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/e00006.vtc 2009-02-11 07:49:21 UTC (rev 3741)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/e00006.vtc 2009-02-11 07:53:47 UTC (rev 3742)
@@ -44,3 +44,4 @@
}
client c1 -run
+varnish v1 -expect esi_errors == 0
Modified: branches/2.0/varnish-cache/bin/varnishtest/tests/e00007.vtc
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/e00007.vtc 2009-02-11 07:49:21 UTC (rev 3741)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/e00007.vtc 2009-02-11 07:53:47 UTC (rev 3742)
@@ -47,3 +47,4 @@
}
client c1 -run
+varnish v1 -expect esi_errors == 0
Modified: branches/2.0/varnish-cache/bin/varnishtest/tests/e00008.vtc
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/e00008.vtc 2009-02-11 07:49:21 UTC (rev 3741)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/e00008.vtc 2009-02-11 07:53:47 UTC (rev 3742)
@@ -72,3 +72,4 @@
}
client c1 -run
+varnish v1 -expect esi_errors == 15
Modified: branches/2.0/varnish-cache/bin/varnishtest/tests/e00009.vtc
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/e00009.vtc 2009-02-11 07:49:21 UTC (rev 3741)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/e00009.vtc 2009-02-11 07:53:47 UTC (rev 3742)
@@ -44,3 +44,4 @@
expect resp.bodylen == 37
expect resp.http.transfer-encoding == "chunked"
} -run
+varnish v1 -expect esi_errors == 1
Modified: branches/2.0/varnish-cache/bin/varnishtest/tests/e00010.vtc
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/e00010.vtc 2009-02-11 07:49:21 UTC (rev 3741)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/e00010.vtc 2009-02-11 07:53:47 UTC (rev 3742)
@@ -25,3 +25,4 @@
expect resp.status == 200
expect resp.bodylen == 21
} -run
+varnish v1 -expect esi_errors == 0
Modified: branches/2.0/varnish-cache/bin/varnishtest/tests/e00011.vtc
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/e00011.vtc 2009-02-11 07:49:21 UTC (rev 3741)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/e00011.vtc 2009-02-11 07:53:47 UTC (rev 3742)
@@ -34,3 +34,4 @@
expect resp.status == 200
expect resp.bodylen == 31
} -run
+varnish v1 -expect esi_errors == 0
Modified: branches/2.0/varnish-cache/bin/varnishtest/tests/e00012.vtc
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/e00012.vtc 2009-02-11 07:49:21 UTC (rev 3741)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/e00012.vtc 2009-02-11 07:53:47 UTC (rev 3742)
@@ -44,3 +44,4 @@
expect resp.status == 200
expect resp.bodylen == 151
} -run
+varnish v1 -expect esi_errors == 0
Modified: branches/2.0/varnish-cache/bin/varnishtest/tests/e00013.vtc
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/e00013.vtc 2009-02-11 07:49:21 UTC (rev 3741)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/e00013.vtc 2009-02-11 07:53:47 UTC (rev 3742)
@@ -23,3 +23,4 @@
} -run
varnish v1 -expect esi_parse == 0
+varnish v1 -expect esi_errors == 0
Modified: branches/2.0/varnish-cache/bin/varnishtest/tests/e00014.vtc
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/e00014.vtc 2009-02-11 07:49:21 UTC (rev 3741)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/e00014.vtc 2009-02-11 07:53:47 UTC (rev 3742)
@@ -24,3 +24,4 @@
} -run
varnish v1 -expect esi_parse == 0
+varnish v1 -expect esi_errors == 0
Modified: branches/2.0/varnish-cache/include/stat_field.h
===================================================================
--- branches/2.0/varnish-cache/include/stat_field.h 2009-02-11 07:49:21 UTC (rev 3741)
+++ branches/2.0/varnish-cache/include/stat_field.h 2009-02-11 07:53:47 UTC (rev 3742)
@@ -132,3 +132,4 @@
MAC_STAT(hcb_insert, uint64_t, 'a', "HCB Inserts")
MAC_STAT(esi_parse, uint64_t, 'a', "Objects ESI parsed (unlock)")
+MAC_STAT(esi_errors, uint64_t, 'a', "ESI parse errors (unlock)")
More information about the varnish-commit
mailing list