[master] 5f5fb8b34 vsl: New Timestamp:Fetch for backend tasks
Dridi Boukelmoune
dridi.boukelmoune at gmail.com
Mon Nov 2 14:58:07 UTC 2020
commit 5f5fb8b34c46ba007c17e37d28cc114004002776
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date: Thu Oct 22 14:23:05 2020 +0200
vsl: New Timestamp:Fetch for backend tasks
If significant time is passed in vcl_backend_fetch it becomes difficult
to interpret Timestamp:Connected, which this new timestamp remedies.
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 13d240a83..02dd19f66 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -420,6 +420,7 @@ vbf_stp_startfetch(struct worker *wrk, struct busyobj *bo)
if (wrk->handling == VCL_RET_ERROR)
return (F_STP_ERROR);
+ VSLb_ts_busyobj(bo, "Fetch", W_TIM_real(wrk));
i = VDI_GetHdr(bo);
now = W_TIM_real(wrk);
diff --git a/bin/varnishtest/tests/c00036.vtc b/bin/varnishtest/tests/c00036.vtc
index 75322844b..97b51d5cc 100644
--- a/bin/varnishtest/tests/c00036.vtc
+++ b/bin/varnishtest/tests/c00036.vtc
@@ -20,6 +20,7 @@ varnish v1 -vcl+backend {
logexpect l1 -v v1 -q "vxid == 1004" {
expect * 1004 VCL_return {^fetch}
+ expect 0 1004 Timestamp {^Fetch:}
expect 0 1004 Timestamp {^Connected:}
expect 0 1004 BackendOpen {^\d+ s1}
expect 0 1004 Timestamp {^Bereq:}
diff --git a/doc/sphinx/reference/vsl.rst b/doc/sphinx/reference/vsl.rst
index 2d4b65b3c..00cec7fc6 100644
--- a/doc/sphinx/reference/vsl.rst
+++ b/doc/sphinx/reference/vsl.rst
@@ -86,6 +86,9 @@ Backend fetch timestamps
Start
Start of the backend fetch processing.
+Fetch
+ Came off vcl_backend_fetch ready to send the backend request.
+
Connected
Successfully established or reused a backend connection.
More information about the varnish-commit
mailing list