Commit 1514de54 authored by Nils Goroll's avatar Nils Goroll

shard director: change default to resolve=LAZY in vcl_init{}

parent e1f2e3d6
......@@ -50,7 +50,7 @@ varnish v1 -vcl+backend {
std.log("reconfigure failed");
}
new ll = directors.round_robin();
ll.add_backend(l.backend(resolve=LAZY));
ll.add_backend(l.backend());
}
sub vcl_recv {
......
......@@ -181,6 +181,6 @@ varnish v1 -errvcl {resolve=NOW can not be used in vcl_init} {
sub vcl_init {
new shard = directors.shard();
new rr = directors.round_robin();
rr.add_backend(shard.backend());
rr.add_backend(shard.backend(resolve=NOW));
}
}
......@@ -535,6 +535,8 @@ is _not_ the order given when backends are added.
* `resolve`
default: `LAZY` in ``vcl_init{}``, `NOW` otherwise
* ``NOW``: look up a backend and return it.
Can not be used in ``vcl_init{}``.
......
......@@ -602,7 +602,13 @@ vmod_shard_backend(VRT_CTX, struct vmod_directors_shard *vshard,
CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
CHECK_OBJ_NOTNULL(vshard, VMOD_SHARD_SHARD_MAGIC);
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) {
case LAZY:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment