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
4d568263
Commit
4d568263
authored
Apr 27, 2018
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add functions to manipulate VCL_BACKEND state
parent
c9d3b3ff
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
5 deletions
+32
-5
cache_backend.c
bin/varnishd/cache/cache_backend.c
+1
-2
cache_backend_probe.c
bin/varnishd/cache/cache_backend_probe.c
+3
-3
cache_director.h
bin/varnishd/cache/cache_director.h
+2
-0
cache_vcl_vrt.c
bin/varnishd/cache/cache_vcl_vrt.c
+26
-0
No files found.
bin/varnishd/cache/cache_backend.c
View file @
4d568263
...
...
@@ -539,8 +539,7 @@ VRT_delete_backend(VRT_CTX, VCL_BACKEND *dp)
TAKE_OBJ_NOTNULL
(
d
,
dp
,
DIRECTOR_MAGIC
);
CAST_OBJ_NOTNULL
(
be
,
d
->
priv
,
BACKEND_MAGIC
);
Lck_Lock
(
&
be
->
mtx
);
be
->
director
->
admin_health
=
VDI_AH_DELETED
;
be
->
director
->
health_changed
=
VTIM_real
();
VRT_DisableDirector
(
be
->
director
);
be
->
cooled
=
VTIM_real
()
+
60
.;
Lck_Unlock
(
&
be
->
mtx
);
Lck_Lock
(
&
backends_mtx
);
...
...
bin/varnishd/cache/cache_backend_probe.c
View file @
4d568263
...
...
@@ -175,7 +175,7 @@ vbp_update_backend(struct vbp_target *vt)
vt
->
backend
->
director
->
health_changed
=
VTIM_real
();
}
vt
->
backend
->
director
->
health
=
1
;
VRT_SetHealth
(
vt
->
backend
->
director
,
1
)
;
}
else
{
if
(
vt
->
backend
->
director
->
health
)
{
logmsg
=
"Went sick"
;
...
...
@@ -184,7 +184,7 @@ vbp_update_backend(struct vbp_target *vt)
}
else
{
logmsg
=
"Still sick"
;
}
vt
->
backend
->
director
->
health
=
0
;
VRT_SetHealth
(
vt
->
backend
->
director
,
0
)
;
}
VSL
(
SLT_Backend_health
,
0
,
"%s %s %s %u %u %u %.6f %.6f %s"
,
vt
->
backend
->
director
->
cli_name
,
logmsg
,
bits
,
...
...
@@ -637,7 +637,7 @@ VBP_Remove(struct backend *be)
CHECK_OBJ_NOTNULL
(
vt
,
VBP_TARGET_MAGIC
);
Lck_Lock
(
&
vbp_mtx
);
be
->
director
->
health
=
1
;
VRT_SetHealth
(
be
->
director
,
1
)
;
be
->
probe
=
NULL
;
vt
->
backend
=
NULL
;
if
(
vt
->
running
)
{
...
...
bin/varnishd/cache/cache_director.h
View file @
4d568263
...
...
@@ -101,6 +101,8 @@ struct director {
int
VRT_AddDirector
(
VRT_CTX
,
struct
director
*
,
const
char
*
,
...)
v_printflike_
(
3
,
4
);
void
VRT_SetHealth
(
VCL_BACKEND
d
,
int
health
);
void
VRT_DisableDirector
(
VCL_BACKEND
);
void
VRT_DelDirector
(
struct
director
*
);
/* cache_director.c */
...
...
bin/varnishd/cache/cache_vcl_vrt.c
View file @
4d568263
...
...
@@ -208,6 +208,32 @@ VRT_DelDirector(struct director *d)
FREE_OBJ
(
vdir
);
}
void
VRT_SetHealth
(
VCL_BACKEND
d
,
int
health
)
{
struct
vcldir
*
vdir
;
CHECK_OBJ_NOTNULL
(
d
,
DIRECTOR_MAGIC
);
vdir
=
d
->
vdir
;
CHECK_OBJ_NOTNULL
(
vdir
,
VCLDIR_MAGIC
);
vdir
->
dir
->
health
=
health
;
}
void
VRT_DisableDirector
(
VCL_BACKEND
d
)
{
struct
vcldir
*
vdir
;
CHECK_OBJ_NOTNULL
(
d
,
DIRECTOR_MAGIC
);
vdir
=
d
->
vdir
;
CHECK_OBJ_NOTNULL
(
vdir
,
VCLDIR_MAGIC
);
vdir
->
dir
->
admin_health
=
VDI_AH_DELETED
;
vdir
->
dir
->
health
=
0
;
vdir
->
dir
->
health_changed
=
VTIM_real
();
}
/*--------------------------------------------------------------------*/
VCL_BACKEND
...
...
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