Commit da10ea30 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Make VDI_Healthy() req/busyobj agnostic.

parent 928dd021
......@@ -735,7 +735,7 @@ void VBE_DiscardHealth(const struct director *vdi);
struct vbc *VDI_GetFd(const struct director *, struct req *);
int VDI_Healthy(const struct director *, const struct req *);
int VDI_Healthy(const struct director *, const uint8_t *digest);
void VDI_CloseFd(struct vbc **vbp);
void VDI_RecycleFd(struct vbc **vbp);
void VDI_AddHostHeader(struct http *to, const struct vbc *vbc);
......
......@@ -123,10 +123,9 @@ VDI_GetFd(const struct director *d, struct req *req)
*/
int
VDI_Healthy(const struct director *d, const struct req *req)
VDI_Healthy(const struct director *d, const uint8_t *digest)
{
CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
return (d->healthy(d, req->digest));
return (d->healthy(d, digest));
}
......@@ -779,7 +779,7 @@ VSLb(req->vsl, SLT_Debug, "XXXX EXP\n");
VSLb(req->vsl, SLT_Debug, "XXXX EXPBUSY\n");
AN(oc);
AN(boc);
if (VDI_Healthy(req->director, req)) {
if (VDI_Healthy(req->director, req->digest)) {
VSLb(req->vsl, SLT_Debug, "deref oc\n");
(void)HSH_Deref(&wrk->stats, oc, NULL);
oc = boc;
......
......@@ -279,7 +279,7 @@ VRT_r_req_backend_healthy(const struct req *req)
if (req->director == NULL)
return (0);
CHECK_OBJ_NOTNULL(req->director, DIRECTOR_MAGIC);
return (VDI_Healthy(req->director, req));
return (VDI_Healthy(req->director, req->digest));
}
/*--------------------------------------------------------------------*/
......@@ -308,8 +308,7 @@ VRT_r_bereq_backend_healthy(const struct busyobj *bo)
CHECK_OBJ_NOTNULL(bo, BUSYOBJ_MAGIC);
CHECK_OBJ_NOTNULL(bo->director, DIRECTOR_MAGIC);
//XXX return (VDI_Healthy(bo->director, req));
return (0);
return (VDI_Healthy(bo->director, bo->digest));
}
/*--------------------------------------------------------------------*/
......
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