Skip to content
This repository has been archived by the owner on Jul 30, 2021. It is now read-only.

Commit

Permalink
Req.hash_always_miss now implies req.hash_ignore_busy.
Browse files Browse the repository at this point in the history
Fixes a case where we might get a cache hit even though hash_always_miss is set.

Fixes: #1073
  • Loading branch information
daghf authored and Tollef Fog Heen committed May 24, 2012
1 parent cf5076a commit 48ab7aa
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 1 deletion.
2 changes: 1 addition & 1 deletion bin/varnishd/cache_hash.c
Expand Up @@ -352,7 +352,7 @@ HSH_Lookup(struct sess *sp, struct objhead **poh)

if (oc->flags & OC_F_BUSY) {
CHECK_OBJ_NOTNULL(oc->busyobj, BUSYOBJ_MAGIC);
if (sp->hash_ignore_busy)
if (sp->hash_ignore_busy || sp->hash_always_miss)
continue;

if (oc->busyobj->vary != NULL &&
Expand Down
55 changes: 55 additions & 0 deletions bin/varnishtest/tests/r01073.vtc
@@ -0,0 +1,55 @@
varnishtest "Test that hash_always_miss also implies hash_ignore_busy. Ticket #1073."

server s1 {
rxreq
sema r1 sync 2
sema r2 sync 2
delay 1
txresp -hdr "Server: 1"
} -start

server s2 {
rxreq
sema r2 sync 2
txresp -hdr "Server: 2"
} -start

varnish v1 -vcl+backend {
sub vcl_recv {
if (req.http.x-hash-always-miss == "1") {
set req.hash_always_miss = true;
}
if (req.http.x-client == "1") {
set req.backend = s1;
}
if (req.http.x-client == "2") {
set req.backend = s2;
}
}
sub vcl_deliver {
if(obj.hits > 0) {
set resp.http.X-Cache = "HIT";
} else {
set resp.http.X-Cache = "MISS";
}
}
} -start

client c1 {
txreq -url "/" -hdr "x-client: 1"
rxresp
expect resp.status == 200
expect resp.http.Server == "1"
} -start

client c2 {
sema r1 sync 2
txreq -url "/" -hdr "x-client: 2" -hdr "x-hash-always-miss: 1"
txreq -url "/" -hdr "x-client: 2"
rxresp
expect resp.status == 200
expect resp.http.Server == "2"
} -start

client c1 -wait
client c2 -wait

0 comments on commit 48ab7aa

Please sign in to comment.