[master] dbad89e Now that saint-mode uses the digest, we can remove the temporary objcore assignment.
Poul-Henning Kamp
phk at varnish-cache.org
Wed Mar 14 22:25:50 CET 2012
commit dbad89eb134506e5c4f8c521d40d685b8388579b
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Wed Mar 14 21:25:25 2012 +0000
Now that saint-mode uses the digest, we can remove the temporary
objcore assignment.
diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index dcb87dd..92e74da 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -271,9 +271,6 @@ vbe_Healthy(const struct vdi_simple *vs, const struct sess *sp)
if (threshold == 0 || VTAILQ_EMPTY(&backend->troublelist))
return (1);
- if (sp->req->objcore == NULL)
- return (1);
-
now = sp->t_req;
old = NULL;
diff --git a/bin/varnishd/cache/cache_hash.c b/bin/varnishd/cache/cache_hash.c
index d154717..749a8f3 100644
--- a/bin/varnishd/cache/cache_hash.c
+++ b/bin/varnishd/cache/cache_hash.c
@@ -377,7 +377,6 @@ HSH_Lookup(struct sess *sp)
*/
AZ(req->objcore);
- req->objcore = grace_oc; /* XXX: Hack-ish */
if (oc == NULL /* We found no live object */
&& grace_oc != NULL /* There is a grace candidate */
&& (busy_oc != NULL /* Somebody else is already busy */
@@ -387,7 +386,6 @@ HSH_Lookup(struct sess *sp)
CHECK_OBJ_NOTNULL(o, OBJECT_MAGIC);
oc = grace_oc;
}
- req->objcore = NULL;
if (oc != NULL && !req->hash_always_miss) {
o = oc_getobj(&wrk->stats, oc);
More information about the varnish-commit
mailing list