[6.0] 63d35cc93 Add MAIN.esi_req counter for ESI subrequests

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Wed Aug 11 15:33:07 UTC 2021


commit 63d35cc937bb5fd23988dc0d1d64bddebe7495f5
Author: Reza Naghibi <reza at naghibi.com>
Date:   Tue Nov 10 16:05:55 2020 -0500

    Add MAIN.esi_req counter for ESI subrequests
    
     Conflicts:
            bin/varnishd/cache/cache_esi_deliver.c

diff --git a/bin/varnishd/VSC_main.vsc b/bin/varnishd/VSC_main.vsc
index f6925f30b..d03144367 100644
--- a/bin/varnishd/VSC_main.vsc
+++ b/bin/varnishd/VSC_main.vsc
@@ -103,6 +103,12 @@
 
 	The count of parseable client requests seen.
 
+.. varnish_vsc:: esi_req
+	:group: wrk
+	:oneliner:	ESI subrequests
+
+	Number of ESI subrequests made.
+
 .. varnish_vsc:: cache_hit
 	:group: wrk
 	:oneliner:	Cache hits
diff --git a/bin/varnishd/cache/cache_esi_deliver.c b/bin/varnishd/cache/cache_esi_deliver.c
index 2f3f8e86f..405bcaaf5 100644
--- a/bin/varnishd/cache/cache_esi_deliver.c
+++ b/bin/varnishd/cache/cache_esi_deliver.c
@@ -122,6 +122,8 @@ ved_include(struct req *preq, const char *src, const char *host,
 	req->vsl->wid = VXID_Get(wrk, VSL_CLIENTMARKER);
 	VSLb(req->vsl, SLT_Begin, "req %u esi", VXID(preq->vsl->wid));
 	VSLb(preq->vsl, SLT_Link, "req %u esi", VXID(req->vsl->wid));
+
+	wrk->stats->esi_req++;
 	req->esi_level = preq->esi_level + 1;
 
 	if (preq->esi_level == 0)
diff --git a/bin/varnishtest/tests/e00003.vtc b/bin/varnishtest/tests/e00003.vtc
index a541596bf..f621b5b4d 100644
--- a/bin/varnishtest/tests/e00003.vtc
+++ b/bin/varnishtest/tests/e00003.vtc
@@ -76,6 +76,7 @@ client c1 {
 }
 
 client c1 -run
+varnish v1 -expect esi_req == 2
 varnish v1 -expect esi_errors == 0
 
 logexpect l1 -wait


More information about the varnish-commit mailing list