r356 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2006-07-06 22:29:26 +0200 (Thu, 06 Jul 2006)
New Revision: 356

Modified:
   trunk/varnish-cache/bin/varnishd/cache_expire.c
Log:
Make sure the grim reaper doesn't touch busy objects either.


Modified: trunk/varnish-cache/bin/varnishd/cache_expire.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_expire.c	2006-07-06 20:26:59 UTC (rev 355)
+++ trunk/varnish-cache/bin/varnishd/cache_expire.c	2006-07-06 20:29:26 UTC (rev 356)
@@ -56,6 +56,11 @@
 		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;
 		}