Skip to content

V
varnish-cache
Commit 44d46093 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp
Browse files
Options

Don't unbusy failed objects, it is pointless and introduces a race.

parent 79c241e5
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 5 deletions
bin/varnishd/cache/cache_fetch.c
View file @ 44d46093
......@@ -683,8 +683,6 @@ vbf_stp_fail(struct worker *wrk, struct busyobj *bo)
assert(bo->state < BOS_FINISHED);
HSH_Fail(bo->fetch_objcore);
if (bo->fetch_objcore->flags & OC_F_BUSY)
HSH_Unbusy(&wrk->stats, bo->fetch_objcore);
wrk->stats.fetch_failed++;
VBO_setstate(bo, BOS_FAILED);
return (F_STP_DONE);
......@@ -738,9 +736,6 @@ vbf_fetch_thread(struct worker *wrk, void *priv)
}
assert(WRW_IsReleased(wrk));
AZ(bo->fetch_objcore->flags & OC_F_BUSY);
HSH_Complete(bo->fetch_objcore);
bo->stats = NULL;
if (bo->vbc != NULL) {
......@@ -756,6 +751,7 @@ vbf_fetch_thread(struct worker *wrk, void *priv)
if (bo->state == BOS_FINISHED) {
assert(!(bo->fetch_objcore->flags & OC_F_FAILED));
HSH_Complete(bo->fetch_objcore);
VSLb(bo->vsl, SLT_Length, "%zd", bo->fetch_obj->len);
{
/* Sanity check fetch methods accounting */
......
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