From: phk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Thu, 6 Jul 2006 20:29:26 +0000 (+0000)
Subject: Make sure the grim reaper doesn't touch busy objects either.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ff03ede0902e68666793d6a004ed9431c799b1d;p=varnish

Make sure the grim reaper doesn't touch busy objects either.


git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@356 d4fa192b-c00b-0410-8231-f00ffab90ce4
---

diff --git a/varnish-cache/bin/varnishd/cache_expire.c b/varnish-cache/bin/varnishd/cache_expire.c
index 89c8b1a4..0939319c 100644
--- a/varnish-cache/bin/varnishd/cache_expire.c
+++ b/varnish-cache/bin/varnishd/cache_expire.c
@@ -56,6 +56,11 @@ exp_hangman(void *arg)
 		TAILQ_FOREACH(o, &exp_deathrow, deathrow) {
 			if (o->ttl >= t)
 				break;
+			if (o->busy) {
+				VSL(SLT_Debug, 0,
+				    "Grim Reaper: Busy object xid %u", o->xid);
+				continue;
+			}
 			if (o->refcnt == 0)
 				break;
 		}