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
72f249e4
Commit
72f249e4
authored
Nov 17, 2018
by
Nils Goroll
Committed by
Dridi Boukelmoune
Feb 06, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix vcl temperature after failing warmup event
Fixes #2835
parent
c1a72221
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
cache_vcl.c
bin/varnishd/cache/cache_vcl.c
+5
-3
v00003.vtc
bin/varnishtest/tests/v00003.vtc
+2
-0
No files found.
bin/varnishd/cache/cache_vcl.c
View file @
72f249e4
...
...
@@ -504,10 +504,12 @@ vcl_set_state(VRT_CTX, const char *state)
else
{
vcl
->
temp
=
VCL_TEMP_WARM
;
i
=
vcl_send_event
(
ctx
,
VCL_EVENT_WARM
);
if
(
i
==
0
)
if
(
i
==
0
)
{
vcl_BackendEvent
(
vcl
,
VCL_EVENT_WARM
);
else
break
;
}
AZ
(
vcl
->
conf
->
event_vcl
(
ctx
,
VCL_EVENT_COLD
));
vcl
->
temp
=
VCL_TEMP_COLD
;
}
break
;
default:
...
...
bin/varnishtest/tests/v00003.vtc
View file @
72f249e4
...
...
@@ -88,6 +88,8 @@ varnish v1 -expect !VBE.vcl1.default.happy
varnish v1 -cliok "param.set max_esi_depth 42"
varnish v1 -clierr 300 "vcl.state vcl1 warm"
varnish v1 -cliexpect "available *cold/cold *[0-9]+ *vcl1\\s+active *warm/warm *[0-9]+ *vcl2" "vcl.list"
# A warm-up failure can also fail a child start
varnish v1 -cliok stop
varnish v1 -cliok "vcl.state vcl1 warm"
...
...
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