[master] e08ed18 Remove a racy assertion on the OC_EF_DYING state

Martin Blix Grydeland martin at varnish-software.com
Wed Feb 11 12:00:04 CET 2015


commit e08ed1881b7d49a3f3bbf2f57cd792946976892a
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Wed Feb 11 11:56:48 2015 +0100

    Remove a racy assertion on the OC_EF_DYING state
    
    This state could be set by the expiry timer even though a reference is
    grabbed during lookup, causing the assertion to trigger.
    
    Fixes: #1539

diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index aa737d9..0900fec 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -358,7 +358,6 @@ cnt_lookup(struct worker *wrk, struct req *req)
 	case VCL_RET_DELIVER:
 		if (boc != NULL) {
 			AZ(oc->flags & OC_F_PASS);
-			AZ(oc->exp_flags & OC_EF_DYING);
 			AZ(boc->busyobj);
 			VBF_Fetch(wrk, req, boc, oc, VBF_BACKGROUND);
 		} else {



More information about the varnish-commit mailing list