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
ed7b3105
Commit
ed7b3105
authored
Feb 19, 2014
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Only attempt to salvage an object into Transient if it wasn't already
destined for Transient in the first place.
parent
a6277de3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
8 deletions
+3
-8
cache_fetch.c
bin/varnishd/cache/cache_fetch.c
+1
-6
r01284.vtc
bin/varnishtest/tests/r01284.vtc
+2
-2
No files found.
bin/varnishd/cache/cache_fetch.c
View file @
ed7b3105
...
...
@@ -107,14 +107,9 @@ vbf_bereq2obj(struct worker *wrk, struct busyobj *bo)
bo
->
stats
=
&
wrk
->
stats
;
AN
(
bo
->
fetch_objcore
);
obj
=
STV_NewObject
(
bo
,
bo
->
storage_hint
,
l
,
nhttp
);
#if 0
// XXX: we shouldn't retry if we're already on Transient
if
(
obj
==
NULL
&&
(
bo
->
storage_hint
==
NULL
||
strcmp
(
bo
->
storage_hint
,
TRANSIENT_STORAGE
)))
{
#else
if
(
obj
==
NULL
)
{
#endif
/*
* Try to salvage the transaction by allocating a
* shortlived object on Transient storage.
...
...
@@ -316,7 +311,7 @@ vbf_stp_fetchhdr(struct worker *wrk, struct busyobj *bo)
if
(
i
)
{
AZ
(
bo
->
vbc
);
return
(
F_STP_ERROR
);
}
}
AN
(
bo
->
vbc
);
http_VSL_log
(
bo
->
beresp
);
...
...
bin/varnishtest/tests/r01284.vtc
View file @
ed7b3105
...
...
@@ -36,8 +36,8 @@ client c1 {
delay 1
} -run
# Two failures, one for obj2 and
two
for the attempts at sending error
varnish v1 -expect SMA.Transient.c_fail ==
3
# Two failures, one for obj2 and
one
for the attempts at sending error
varnish v1 -expect SMA.Transient.c_fail ==
2
client c1 {
# Check that Varnish is still alive
...
...
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