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 89c8b1a49c3dcb6f15e3ddff7eed344536c195ab..0939319c241f75efcc581bf60bf061042a2add28 100644 (file)
--- 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;
                }