Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
unique-xids
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
uplex-varnish
unique-xids
Commits
da10ea30
Commit
da10ea30
authored
Apr 29, 2013
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make VDI_Healthy() req/busyobj agnostic.
parent
928dd021
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
8 deletions
+6
-8
cache.h
bin/varnishd/cache/cache.h
+1
-1
cache_dir.c
bin/varnishd/cache/cache_dir.c
+2
-3
cache_req_fsm.c
bin/varnishd/cache/cache_req_fsm.c
+1
-1
cache_vrt_var.c
bin/varnishd/cache/cache_vrt_var.c
+2
-3
No files found.
bin/varnishd/cache/cache.h
View file @
da10ea30
...
@@ -735,7 +735,7 @@ void VBE_DiscardHealth(const struct director *vdi);
...
@@ -735,7 +735,7 @@ void VBE_DiscardHealth(const struct director *vdi);
struct
vbc
*
VDI_GetFd
(
const
struct
director
*
,
struct
req
*
);
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_CloseFd
(
struct
vbc
**
vbp
);
void
VDI_RecycleFd
(
struct
vbc
**
vbp
);
void
VDI_RecycleFd
(
struct
vbc
**
vbp
);
void
VDI_AddHostHeader
(
struct
http
*
to
,
const
struct
vbc
*
vbc
);
void
VDI_AddHostHeader
(
struct
http
*
to
,
const
struct
vbc
*
vbc
);
...
...
bin/varnishd/cache/cache_dir.c
View file @
da10ea30
...
@@ -123,10 +123,9 @@ VDI_GetFd(const struct director *d, struct req *req)
...
@@ -123,10 +123,9 @@ VDI_GetFd(const struct director *d, struct req *req)
*/
*/
int
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
);
CHECK_OBJ_NOTNULL
(
d
,
DIRECTOR_MAGIC
);
return
(
d
->
healthy
(
d
,
req
->
digest
));
return
(
d
->
healthy
(
d
,
digest
));
}
}
bin/varnishd/cache/cache_req_fsm.c
View file @
da10ea30
...
@@ -779,7 +779,7 @@ VSLb(req->vsl, SLT_Debug, "XXXX EXP\n");
...
@@ -779,7 +779,7 @@ VSLb(req->vsl, SLT_Debug, "XXXX EXP\n");
VSLb
(
req
->
vsl
,
SLT_Debug
,
"XXXX EXPBUSY
\n
"
);
VSLb
(
req
->
vsl
,
SLT_Debug
,
"XXXX EXPBUSY
\n
"
);
AN
(
oc
);
AN
(
oc
);
AN
(
boc
);
AN
(
boc
);
if
(
VDI_Healthy
(
req
->
director
,
req
))
{
if
(
VDI_Healthy
(
req
->
director
,
req
->
digest
))
{
VSLb
(
req
->
vsl
,
SLT_Debug
,
"deref oc
\n
"
);
VSLb
(
req
->
vsl
,
SLT_Debug
,
"deref oc
\n
"
);
(
void
)
HSH_Deref
(
&
wrk
->
stats
,
oc
,
NULL
);
(
void
)
HSH_Deref
(
&
wrk
->
stats
,
oc
,
NULL
);
oc
=
boc
;
oc
=
boc
;
...
...
bin/varnishd/cache/cache_vrt_var.c
View file @
da10ea30
...
@@ -279,7 +279,7 @@ VRT_r_req_backend_healthy(const struct req *req)
...
@@ -279,7 +279,7 @@ VRT_r_req_backend_healthy(const struct req *req)
if
(
req
->
director
==
NULL
)
if
(
req
->
director
==
NULL
)
return
(
0
);
return
(
0
);
CHECK_OBJ_NOTNULL
(
req
->
director
,
DIRECTOR_MAGIC
);
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)
...
@@ -308,8 +308,7 @@ VRT_r_bereq_backend_healthy(const struct busyobj *bo)
CHECK_OBJ_NOTNULL
(
bo
,
BUSYOBJ_MAGIC
);
CHECK_OBJ_NOTNULL
(
bo
,
BUSYOBJ_MAGIC
);
CHECK_OBJ_NOTNULL
(
bo
->
director
,
DIRECTOR_MAGIC
);
CHECK_OBJ_NOTNULL
(
bo
->
director
,
DIRECTOR_MAGIC
);
//XXX return (VDI_Healthy(bo->director, req));
return
(
VDI_Healthy
(
bo
->
director
,
bo
->
digest
));
return
(
0
);
}
}
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment