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
fd238e4f
Commit
fd238e4f
authored
Oct 09, 2013
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix these two test-cases to work with the new LRU strategy.
Log a little bit more debugging information for now.
parent
a44b3a81
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
10 deletions
+15
-10
cache_expire.c
bin/varnishd/cache/cache_expire.c
+3
-0
c00044.vtc
bin/varnishtest/tests/c00044.vtc
+6
-4
c00045.vtc
bin/varnishtest/tests/c00045.vtc
+6
-6
No files found.
bin/varnishd/cache/cache_expire.c
View file @
fd238e4f
...
...
@@ -276,6 +276,9 @@ EXP_NukeOne(struct busyobj *bo, struct lru *lru)
VTAILQ_FOREACH
(
oc
,
&
lru
->
lru_head
,
lru_list
)
{
CHECK_OBJ_NOTNULL
(
oc
,
OBJCORE_MAGIC
);
VSLb
(
bo
->
vsl
,
SLT_ExpKill
,
"LRU_Cand %p f=0x%x r=%d"
,
oc
,
oc
->
flags
,
oc
->
refcnt
);
AZ
(
oc
->
flags
&
OC_F_DYING
);
/*
...
...
bin/varnishtest/tests/c00044.vtc
View file @
fd238e4f
...
...
@@ -3,16 +3,18 @@ varnishtest "Object/LRU/Stevedores"
server s1 {
rxreq
txresp -bodylen 1048190
rxreq
txresp -bodylen 1048191
rxreq
txresp -bodylen 1048192
rxreq
txresp -bodylen 104
8
193
txresp -bodylen 104
7
193
rxreq
txresp -bodylen 104
8
194
txresp -bodylen 104
7
194
} -start
varnish v1 -storage "-smalloc,1m -smalloc,1m, -smalloc,1m" -vcl+backend {
...
...
@@ -72,7 +74,7 @@ client c1 {
txreq -url /foo1
rxresp
expect resp.status == 200
expect resp.bodylen == 104
8
193
expect resp.bodylen == 104
7
193
} -run
varnish v1 -expect n_lru_nuked == 1
...
...
@@ -81,7 +83,7 @@ client c1 {
txreq -url /foo
rxresp
expect resp.status == 200
expect resp.bodylen == 104
8
194
expect resp.bodylen == 104
7
194
} -run
varnish v1 -expect n_lru_nuked == 2
bin/varnishtest/tests/c00045.vtc
View file @
fd238e4f
...
...
@@ -4,9 +4,9 @@ server s1 {
rxreq
txresp -bodylen 1048188
rxreq
txresp -bodylen 104
8
189
txresp -bodylen 104
7
189
rxreq
txresp -bodylen 104
8
190
txresp -bodylen 104
7
190
} -start
varnish v1 -storage "-smalloc,1m -smalloc,1m, -smalloc,1m" -vcl+backend {
...
...
@@ -36,13 +36,13 @@ client c1 {
txreq -url /bar
rxresp
expect resp.status == 200
expect resp.bodylen == 104
8
189
expect resp.bodylen == 104
7
189
} -run
varnish v1 -expect n_lru_nuked == 1
varnish v1 -expect SMA.Transient.g_bytes == 0
varnish v1 -expect SMA.s0.g_bytes > 1000000
varnish v1 -expect SMA.s0.g_space < 1
70
varnish v1 -expect SMA.s0.g_space < 1
171
varnish v1 -expect SMA.s1.g_bytes == 0
varnish v1 -expect SMA.s1.g_space > 1000000
varnish v1 -expect SMA.s2.g_bytes == 0
...
...
@@ -52,13 +52,13 @@ client c1 {
txreq -url /foo
rxresp
expect resp.status == 200
expect resp.bodylen == 104
8
190
expect resp.bodylen == 104
7
190
} -run
varnish v1 -expect n_lru_nuked == 2
varnish v1 -expect SMA.Transient.g_bytes == 0
varnish v1 -expect SMA.s0.g_bytes > 1000000
varnish v1 -expect SMA.s0.g_space < 1
70
varnish v1 -expect SMA.s0.g_space < 1
172
varnish v1 -expect SMA.s1.g_bytes == 0
varnish v1 -expect SMA.s1.g_space > 1000000
varnish v1 -expect SMA.s2.g_bytes == 0
...
...
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