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
01f0e719
Commit
01f0e719
authored
May 19, 2014
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Directors are allowed to fail to pick a backend.
Fixes #1501
parent
75802e27
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
6 deletions
+26
-6
cache_fetch.c
bin/varnishd/cache/cache_fetch.c
+0
-2
cache_http1_fetch.c
bin/varnishd/cache/cache_http1_fetch.c
+4
-0
cache_vrt_var.c
bin/varnishd/cache/cache_vrt_var.c
+1
-4
r01501.vtc
bin/varnishtest/tests/r01501.vtc
+21
-0
No files found.
bin/varnishd/cache/cache_fetch.c
View file @
01f0e719
...
...
@@ -181,7 +181,6 @@ vbf_stp_mkbereq(const struct worker *wrk, struct busyobj *bo)
CHECK_OBJ_NOTNULL
(
bo
->
req
,
REQ_MAGIC
);
assert
(
bo
->
state
==
BOS_INVALID
);
AN
(
bo
->
director
);
AZ
(
bo
->
vbc
);
AZ
(
bo
->
should_close
);
AZ
(
bo
->
storage_hint
);
...
...
@@ -255,7 +254,6 @@ vbf_stp_startfetch(struct worker *wrk, struct busyobj *bo)
CHECK_OBJ_NOTNULL
(
wrk
,
WORKER_MAGIC
);
CHECK_OBJ_NOTNULL
(
bo
,
BUSYOBJ_MAGIC
);
AN
(
bo
->
director
);
AZ
(
bo
->
vbc
);
AZ
(
bo
->
should_close
);
AZ
(
bo
->
storage_hint
);
...
...
bin/varnishd/cache/cache_http1_fetch.c
View file @
01f0e719
...
...
@@ -300,6 +300,10 @@ V1F_fetch_hdr(struct worker *wrk, struct busyobj *bo, struct req *req)
CHECK_OBJ_NOTNULL
(
bo
,
BUSYOBJ_MAGIC
);
htc
=
&
bo
->
htc
;
if
(
bo
->
director
==
NULL
)
{
VSLb
(
bo
->
vsl
,
SLT_FetchError
,
"No backend"
);
return
(
-
1
);
}
AN
(
bo
->
director
);
hp
=
bo
->
bereq
;
...
...
bin/varnishd/cache/cache_vrt_var.c
View file @
01f0e719
...
...
@@ -270,9 +270,8 @@ VRT_r_beresp_backend_name(const struct vrt_ctx *ctx)
CHECK_OBJ_NOTNULL
(
ctx
->
bo
->
vbc
,
VBC_MAGIC
);
return
(
ctx
->
bo
->
vbc
->
backend
->
vcl_name
);
}
if
(
ctx
->
bo
->
director
!=
NULL
)
{
if
(
ctx
->
bo
->
director
!=
NULL
)
return
(
ctx
->
bo
->
director
->
vcl_name
);
}
return
(
NULL
);
}
...
...
@@ -350,7 +349,6 @@ VRT_l_bereq_backend(const struct vrt_ctx *ctx, struct director *be)
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
CHECK_OBJ_NOTNULL
(
ctx
->
bo
,
BUSYOBJ_MAGIC
);
AN
(
ctx
->
bo
->
director
);
ctx
->
bo
->
director
=
be
;
}
...
...
@@ -360,7 +358,6 @@ VRT_r_bereq_backend(const struct vrt_ctx *ctx)
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
CHECK_OBJ_NOTNULL
(
ctx
->
bo
,
BUSYOBJ_MAGIC
);
AN
(
ctx
->
bo
->
director
);
return
(
ctx
->
bo
->
director
);
}
...
...
bin/varnishtest/tests/r01501.vtc
0 → 100644
View file @
01f0e719
varnishtest "director fails to pick backend"
server s1 {
rxreq
txresp
} -start
varnish v1 -vcl+backend {
import ${vmod_debug};
sub vcl_recv {
set req.backend_hint = debug.no_backend();
}
} -start
client c1 {
txreq
rxresp
expect resp.status == 503
} -run
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