[master] 6e6421360 vsc: Rename fetch_no_thread to bgfetch_no_thread
Dridi Boukelmoune
dridi.boukelmoune at gmail.com
Mon Aug 29 13:42:07 UTC 2022
commit 6e642136082018545089a627063a8c213ecf46dd
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date: Mon Jul 18 17:23:39 2022 +0200
vsc: Rename fetch_no_thread to bgfetch_no_thread
A fetch transaction is always successfully scheduled or queued, so the
fetch_no_thread counter can only ever stay at zero. The plan is to relax
this for bgfetch tasks.
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 40b304fa7..1edb65576 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -1173,7 +1173,7 @@ VBF_Fetch(struct worker *wrk, struct req *req, struct objcore *oc,
bo->fetch_task->func = vbf_fetch_thread;
if (Pool_Task(wrk->pool, bo->fetch_task, TASK_QUEUE_BO)) {
- wrk->stats->fetch_no_thread++;
+ wrk->stats->bgfetch_no_thread++;
(void)vbf_stp_fail(req->wrk, bo);
if (bo->stale_oc != NULL)
(void)HSH_DerefObjCore(wrk, &bo->stale_oc, 0);
diff --git a/lib/libvsc/VSC_main.vsc b/lib/libvsc/VSC_main.vsc
index c895f7a1c..047218ad8 100644
--- a/lib/libvsc/VSC_main.vsc
+++ b/lib/libvsc/VSC_main.vsc
@@ -256,11 +256,11 @@
beresp fetch failed.
-.. varnish_vsc:: fetch_no_thread
+.. varnish_vsc:: bgfetch_no_thread
:group: wrk
- :oneliner: Fetch failed (no thread)
+ :oneliner: Background fetch failed (no thread)
- beresp fetch failed, no thread available.
+ A bgfetch triggered by a grace hit failed, no thread available.
.. varnish_vsc:: pools
:type: gauge
More information about the varnish-commit
mailing list