Commit fd238e4f authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Fix these two test-cases to work with the new LRU strategy.

Log a little bit more debugging information for now.
parent a44b3a81
......@@ -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);
/*
......
......@@ -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 1048193
txresp -bodylen 1047193
rxreq
txresp -bodylen 1048194
txresp -bodylen 1047194
} -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 == 1048193
expect resp.bodylen == 1047193
} -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 == 1048194
expect resp.bodylen == 1047194
} -run
varnish v1 -expect n_lru_nuked == 2
......@@ -4,9 +4,9 @@ server s1 {
rxreq
txresp -bodylen 1048188
rxreq
txresp -bodylen 1048189
txresp -bodylen 1047189
rxreq
txresp -bodylen 1048190
txresp -bodylen 1047190
} -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 == 1048189
expect resp.bodylen == 1047189
} -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 < 170
varnish v1 -expect SMA.s0.g_space < 1171
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 == 1048190
expect resp.bodylen == 1047190
} -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 < 170
varnish v1 -expect SMA.s0.g_space < 1172
varnish v1 -expect SMA.s1.g_bytes == 0
varnish v1 -expect SMA.s1.g_space > 1000000
varnish v1 -expect SMA.s2.g_bytes == 0
......
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