[master] d089c57 Use correct test for busyness
Poul-Henning Kamp
phk at FreeBSD.org
Tue Apr 19 18:15:06 CEST 2016
commit d089c5732bc59a53a3abed43679110d424d00e6a
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Tue Apr 19 15:56:03 2016 +0000
Use correct test for busyness
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 8a513f2..c076bcc 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -908,13 +908,10 @@ vbf_stp_fail(struct worker *wrk, const struct busyobj *bo)
assert(bo->fetch_objcore->boc->state < BOS_FINISHED);
HSH_Fail(bo->fetch_objcore);
- if (bo->fetch_objcore->exp_flags & OC_EF_EXP) {
- /* Already unbusied - expire it */
- AN(bo->fetch_objcore);
+ if (!(bo->fetch_objcore->flags & OC_F_BUSY))
HSH_Kill(bo->fetch_objcore);
- }
- wrk->stats->fetch_failed++;
ObjSetState(wrk, bo->fetch_objcore, BOS_FAILED);
+ wrk->stats->fetch_failed++;
return (F_STP_DONE);
}
More information about the varnish-commit
mailing list