Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
d60d80d3
Commit
d60d80d3
authored
Jan 19, 2015
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move responsibility for discarding backend probes.
parent
97adb56b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
34 additions
and
47 deletions
+34
-47
cache_backend.c
bin/varnishd/cache/cache_backend.c
+27
-36
cache_backend.h
bin/varnishd/cache/cache_backend.h
+0
-1
cache_vcl.c
bin/varnishd/cache/cache_vcl.c
+0
-5
vrt.h
include/vrt.h
+2
-2
vcc_backend.c
lib/libvcc/vcc_backend.c
+5
-3
No files found.
bin/varnishd/cache/cache_backend.c
View file @
d60d80d3
...
...
@@ -101,25 +101,6 @@ VBE_UseHealth(const struct director *vdi)
VBP_Use
(
vs
->
backend
,
vs
->
vrt
->
probe
);
}
/*--------------------------------------------------------------------
*
*/
void
VBE_DiscardHealth
(
const
struct
director
*
vdi
)
{
struct
vbe_dir
*
vs
;
ASSERT_CLI
();
if
(
strcmp
(
vdi
->
name
,
"simple"
))
return
;
CAST_OBJ_NOTNULL
(
vs
,
vdi
->
priv
,
VDI_SIMPLE_MAGIC
);
if
(
vs
->
vrt
->
probe
==
NULL
)
return
;
VBP_Remove
(
vs
->
backend
,
vs
->
vrt
->
probe
);
}
/*--------------------------------------------------------------------
* Get a connection to the backend
*/
...
...
@@ -294,39 +275,49 @@ vbe_dir_getbody(const struct director *d, struct worker *wrk,
/*--------------------------------------------------------------------*/
static
void
vbe_dir_http1pipe
(
const
struct
director
*
d
,
struct
req
*
req
,
struct
busyobj
*
bo
)
{
int
i
;
CHECK_OBJ_NOTNULL
(
req
,
REQ_MAGIC
);
CHECK_OBJ_NOTNULL
(
bo
,
BUSYOBJ_MAGIC
);
i
=
vbe_dir_getfd
(
d
,
bo
);
V1P_Process
(
req
,
bo
,
i
);
vbe_dir_finish
(
d
,
bo
->
wrk
,
bo
);
}
/*--------------------------------------------------------------------*/
void
VRT_fini_vbe
(
VRT_CTX
,
struct
director
*
d
)
VRT_fini_vbe
(
VRT_CTX
,
struct
director
*
*
dp
,
const
struct
vrt_backend
*
vrt
)
{
struct
vbe_dir
*
vs
;
struct
director
*
d
;
ASSERT_CLI
();
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
AN
(
dp
);
(
void
)
vrt
;
d
=
*
dp
;
*
dp
=
NULL
;
CHECK_OBJ_NOTNULL
(
d
,
DIRECTOR_MAGIC
);
CAST_OBJ_NOTNULL
(
vs
,
d
->
priv
,
VDI_SIMPLE_MAGIC
);
if
(
vs
->
vrt
->
probe
!=
NULL
)
VBP_Remove
(
vs
->
backend
,
vs
->
vrt
->
probe
);
VBE_DropRefVcl
(
vs
->
backend
);
free
(
vs
->
dir
.
vcl_name
);
vs
->
dir
.
magic
=
0
;
FREE_OBJ
(
vs
);
d
->
priv
=
NULL
;
}
static
void
vbe_dir_http1pipe
(
const
struct
director
*
d
,
struct
req
*
req
,
struct
busyobj
*
bo
)
{
int
i
;
CHECK_OBJ_NOTNULL
(
req
,
REQ_MAGIC
);
CHECK_OBJ_NOTNULL
(
bo
,
BUSYOBJ_MAGIC
);
i
=
vbe_dir_getfd
(
d
,
bo
);
V1P_Process
(
req
,
bo
,
i
);
vbe_dir_finish
(
d
,
bo
->
wrk
,
bo
);
}
void
VRT_init_vbe
(
VRT_CTX
,
struct
director
**
bp
,
int
idx
,
const
struct
vrt_backend
*
vrt
)
VRT_init_vbe
(
VRT_CTX
,
struct
director
**
bp
,
const
struct
vrt_backend
*
vrt
)
{
struct
vbe_dir
*
vs
;
...
...
@@ -351,5 +342,5 @@ VRT_init_vbe(VRT_CTX, struct director **bp, int idx,
if
(
vs
->
vrt
->
probe
!=
NULL
)
VBP_Insert
(
vs
->
backend
,
vs
->
vrt
->
probe
,
vs
->
vrt
->
hosthdr
);
bp
[
idx
]
=
&
vs
->
dir
;
*
bp
=
&
vs
->
dir
;
}
bin/varnishd/cache/cache_backend.h
View file @
d60d80d3
...
...
@@ -98,7 +98,6 @@ struct vbc {
/* cache_backend.c */
void
VBE_UseHealth
(
const
struct
director
*
vdi
);
void
VBE_DiscardHealth
(
const
struct
director
*
vdi
);
/* cache_backend_cfg.c */
void
VBE_DropRefConn
(
struct
backend
*
,
const
struct
acct_bereq
*
);
...
...
bin/varnishd/cache/cache_vcl.c
View file @
d60d80d3
...
...
@@ -330,7 +330,6 @@ static void
ccf_config_discard
(
struct
cli
*
cli
,
const
char
*
const
*
av
,
void
*
priv
)
{
struct
vcls
*
vcl
;
int
i
;
ASSERT_CLI
();
AZ
(
priv
);
...
...
@@ -353,10 +352,6 @@ ccf_config_discard(struct cli *cli, const char * const *av, void *priv)
vcl
->
conf
->
discard
=
1
;
Lck_Unlock
(
&
vcl_mtx
);
/* Tickle this VCL's backends to give up health polling */
for
(
i
=
1
;
i
<
vcl
->
conf
->
ndirector
;
i
++
)
VBE_DiscardHealth
(
vcl
->
conf
->
director
[
i
]);
if
(
vcl
->
conf
->
busy
==
0
)
VCL_Nuke
(
vcl
);
}
...
...
include/vrt.h
View file @
d60d80d3
...
...
@@ -225,8 +225,8 @@ void VRT_Rollback(VRT_CTX, const struct http *);
void
VRT_synth_page
(
VRT_CTX
,
const
char
*
,
...);
/* Backend related */
void
VRT_init_vbe
(
VRT_CTX
,
struct
director
**
,
int
idx
,
const
struct
vrt_backend
*
);
void
VRT_fini_vbe
(
VRT_CTX
,
struct
director
*
);
void
VRT_init_vbe
(
VRT_CTX
,
struct
director
**
,
const
struct
vrt_backend
*
);
void
VRT_fini_vbe
(
VRT_CTX
,
struct
director
*
*
,
const
struct
vrt_backend
*
);
/* Suckaddr related */
int
VRT_VSA_GetPtr
(
const
struct
suckaddr
*
sua
,
const
unsigned
char
**
dst
);
...
...
lib/libvcc/vcc_backend.c
View file @
d60d80d3
...
...
@@ -423,9 +423,11 @@ vcc_ParseHostDef(struct vcc *tl, const struct token *t_be)
ifp
=
New_IniFin
(
tl
);
VSB_printf
(
ifp
->
ini
,
"
\t
VRT_init_vbe(ctx, VCL_conf.director,
\n
"
"
\t
VGC_backend_%s, &vgc_dir_priv_%s);"
,
vgcname
,
vgcname
);
VSB_printf
(
ifp
->
fin
,
"
\t
VRT_fini_vbe(ctx, VGCDIR(%s));"
,
vgcname
);
"
\t
VRT_init_vbe(ctx, &VGCDIR(%s), &vgc_dir_priv_%s);"
,
vgcname
,
vgcname
);
VSB_printf
(
ifp
->
fin
,
"
\t
VRT_fini_vbe(ctx, &VGCDIR(%s), &vgc_dir_priv_%s);"
,
vgcname
,
vgcname
);
tl
->
ndirector
++
;
}
...
...
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