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
c5966cb7
Commit
c5966cb7
authored
Jan 27, 2017
by
Guillaume Quintard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add optional sticky arg to fb director
parent
2f054422
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
5 deletions
+16
-5
fall_back.c
lib/libvmod_directors/fall_back.c
+11
-4
vmod.vcc
lib/libvmod_directors/vmod.vcc
+5
-1
No files found.
lib/libvmod_directors/fall_back.c
View file @
c5966cb7
...
@@ -42,6 +42,8 @@ struct vmod_directors_fallback {
...
@@ -42,6 +42,8 @@ struct vmod_directors_fallback {
unsigned
magic
;
unsigned
magic
;
#define VMOD_DIRECTORS_FALLBACK_MAGIC 0xad4e26ba
#define VMOD_DIRECTORS_FALLBACK_MAGIC 0xad4e26ba
struct
vdir
*
vd
;
struct
vdir
*
vd
;
VCL_BOOL
st
;
unsigned
cur
;
};
};
static
unsigned
__match_proto__
(
vdi_healthy
)
static
unsigned
__match_proto__
(
vdi_healthy
)
...
@@ -66,12 +68,16 @@ vmod_fallback_resolve(const struct director *dir, struct worker *wrk,
...
@@ -66,12 +68,16 @@ vmod_fallback_resolve(const struct director *dir, struct worker *wrk,
CHECK_OBJ_NOTNULL
(
wrk
,
WORKER_MAGIC
);
CHECK_OBJ_NOTNULL
(
wrk
,
WORKER_MAGIC
);
CHECK_OBJ_NOTNULL
(
bo
,
BUSYOBJ_MAGIC
);
CHECK_OBJ_NOTNULL
(
bo
,
BUSYOBJ_MAGIC
);
CAST_OBJ_NOTNULL
(
rr
,
dir
->
priv
,
VMOD_DIRECTORS_FALLBACK_MAGIC
);
CAST_OBJ_NOTNULL
(
rr
,
dir
->
priv
,
VMOD_DIRECTORS_FALLBACK_MAGIC
);
vdir_rdlock
(
rr
->
vd
);
vdir_wrlock
(
rr
->
vd
);
if
(
!
rr
->
st
)
rr
->
cur
=
0
;
for
(
u
=
0
;
u
<
rr
->
vd
->
n_backend
;
u
++
)
{
for
(
u
=
0
;
u
<
rr
->
vd
->
n_backend
;
u
++
)
{
be
=
rr
->
vd
->
backend
[
u
];
be
=
rr
->
vd
->
backend
[
rr
->
cur
];
CHECK_OBJ_NOTNULL
(
be
,
DIRECTOR_MAGIC
);
CHECK_OBJ_NOTNULL
(
be
,
DIRECTOR_MAGIC
);
if
(
be
->
healthy
(
be
,
bo
,
NULL
))
if
(
be
->
healthy
(
be
,
bo
,
NULL
))
break
;
break
;
if
(
++
rr
->
cur
==
rr
->
vd
->
n_backend
)
rr
->
cur
=
0
;
}
}
vdir_unlock
(
rr
->
vd
);
vdir_unlock
(
rr
->
vd
);
if
(
u
==
rr
->
vd
->
n_backend
)
if
(
u
==
rr
->
vd
->
n_backend
)
...
@@ -81,7 +87,7 @@ vmod_fallback_resolve(const struct director *dir, struct worker *wrk,
...
@@ -81,7 +87,7 @@ vmod_fallback_resolve(const struct director *dir, struct worker *wrk,
VCL_VOID
__match_proto__
()
VCL_VOID
__match_proto__
()
vmod_fallback__init
(
VRT_CTX
,
vmod_fallback__init
(
VRT_CTX
,
struct
vmod_directors_fallback
**
rrp
,
const
char
*
vcl_name
)
struct
vmod_directors_fallback
**
rrp
,
const
char
*
vcl_name
,
VCL_BOOL
sticky
)
{
{
struct
vmod_directors_fallback
*
rr
;
struct
vmod_directors_fallback
*
rr
;
...
@@ -93,6 +99,7 @@ vmod_fallback__init(VRT_CTX,
...
@@ -93,6 +99,7 @@ vmod_fallback__init(VRT_CTX,
*
rrp
=
rr
;
*
rrp
=
rr
;
vdir_new
(
&
rr
->
vd
,
"fallback"
,
vcl_name
,
vmod_fallback_healthy
,
vdir_new
(
&
rr
->
vd
,
"fallback"
,
vcl_name
,
vmod_fallback_healthy
,
vmod_fallback_resolve
,
rr
);
vmod_fallback_resolve
,
rr
);
rr
->
st
=
sticky
;
}
}
VCL_VOID
__match_proto__
()
VCL_VOID
__match_proto__
()
...
@@ -123,7 +130,7 @@ vmod_fallback_remove_backend(VRT_CTX,
...
@@ -123,7 +130,7 @@ vmod_fallback_remove_backend(VRT_CTX,
{
{
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
CHECK_OBJ_NOTNULL
(
fb
,
VMOD_DIRECTORS_FALLBACK_MAGIC
);
CHECK_OBJ_NOTNULL
(
fb
,
VMOD_DIRECTORS_FALLBACK_MAGIC
);
vdir_remove_backend
(
fb
->
vd
,
be
,
NULL
);
vdir_remove_backend
(
fb
->
vd
,
be
,
&
fb
->
cur
);
}
}
VCL_BACKEND
__match_proto__
()
VCL_BACKEND
__match_proto__
()
...
...
lib/libvmod_directors/vmod.vcc
View file @
c5966cb7
...
@@ -95,7 +95,7 @@ Example
...
@@ -95,7 +95,7 @@ Example
set req.backend_hint = vdir.backend();
set req.backend_hint = vdir.backend();
$Object fallback()
$Object fallback(
BOOL sticky = 0
)
Description
Description
Create a fallback director.
Create a fallback director.
...
@@ -103,6 +103,10 @@ Description
...
@@ -103,6 +103,10 @@ Description
A fallback director will try each of the added backends in turn,
A fallback director will try each of the added backends in turn,
and return the first one that is healthy.
and return the first one that is healthy.
If ``sticky`` is set to true, the director will keep using the healthy
backend, even if a higher-priority backend becomes available. Once the
whole backend list is exhausted, it'll start over at the beginning.
Example
Example
new vdir = directors.fallback();
new vdir = directors.fallback();
...
...
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