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
1514de54
Commit
1514de54
authored
Mar 09, 2018
by
Nils Goroll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shard director: change default to resolve=LAZY in vcl_init{}
parent
e1f2e3d6
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
3 deletions
+11
-3
d00021.vtc
bin/varnishtest/tests/d00021.vtc
+1
-1
d00030.vtc
bin/varnishtest/tests/d00030.vtc
+1
-1
vmod.vcc
lib/libvmod_directors/vmod.vcc
+2
-0
vmod_shard.c
lib/libvmod_directors/vmod_shard.c
+7
-1
No files found.
bin/varnishtest/tests/d00021.vtc
View file @
1514de54
...
@@ -50,7 +50,7 @@ varnish v1 -vcl+backend {
...
@@ -50,7 +50,7 @@ varnish v1 -vcl+backend {
std.log("reconfigure failed");
std.log("reconfigure failed");
}
}
new ll = directors.round_robin();
new ll = directors.round_robin();
ll.add_backend(l.backend(
resolve=LAZY
));
ll.add_backend(l.backend());
}
}
sub vcl_recv {
sub vcl_recv {
...
...
bin/varnishtest/tests/d00030.vtc
View file @
1514de54
...
@@ -181,6 +181,6 @@ varnish v1 -errvcl {resolve=NOW can not be used in vcl_init} {
...
@@ -181,6 +181,6 @@ varnish v1 -errvcl {resolve=NOW can not be used in vcl_init} {
sub vcl_init {
sub vcl_init {
new shard = directors.shard();
new shard = directors.shard();
new rr = directors.round_robin();
new rr = directors.round_robin();
rr.add_backend(shard.backend());
rr.add_backend(shard.backend(
resolve=NOW
));
}
}
}
}
lib/libvmod_directors/vmod.vcc
View file @
1514de54
...
@@ -535,6 +535,8 @@ is _not_ the order given when backends are added.
...
@@ -535,6 +535,8 @@ is _not_ the order given when backends are added.
* `resolve`
* `resolve`
default: `LAZY` in ``vcl_init{}``, `NOW` otherwise
* ``NOW``: look up a backend and return it.
* ``NOW``: look up a backend and return it.
Can not be used in ``vcl_init{}``.
Can not be used in ``vcl_init{}``.
...
...
lib/libvmod_directors/vmod_shard.c
View file @
1514de54
...
@@ -602,7 +602,13 @@ vmod_shard_backend(VRT_CTX, struct vmod_directors_shard *vshard,
...
@@ -602,7 +602,13 @@ vmod_shard_backend(VRT_CTX, struct vmod_directors_shard *vshard,
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
CHECK_OBJ_NOTNULL
(
vshard
,
VMOD_SHARD_SHARD_MAGIC
);
CHECK_OBJ_NOTNULL
(
vshard
,
VMOD_SHARD_SHARD_MAGIC
);
assert
((
args
&
~
_arg_mask
)
==
0
);
assert
((
args
&
~
_arg_mask
)
==
0
);
resolve
=
(
args
&
arg_resolve
)
?
parse_resolve_e
(
a
->
resolve
)
:
NOW
;
if
(
args
&
arg_resolve
)
resolve
=
parse_resolve_e
(
a
->
resolve
);
else
if
(
ctx
->
method
&
VCL_MET_TASK_H
)
resolve
=
LAZY
;
else
resolve
=
NOW
;
switch
(
resolve
)
{
switch
(
resolve
)
{
case
LAZY
:
case
LAZY
:
...
...
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