Skip to content

U
unique-xids
Commit d1ba9327 authored by Martin Blix Grydeland's avatar Martin Blix Grydeland
Browse files
Options

Do not consider busy objects as candidates in EXP_NukeOne. 

An attempt to nuke a busy object will end in assertion.
parent 1f4006e8
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
bin/varnishd/cache_expire.c
View file @ d1ba9327
...@@ -431,9 +431,10 @@ EXP_NukeOne(struct worker *w, struct lru *lru) ...@@ -431,9 +431,10 @@ EXP_NukeOne(struct worker *w, struct lru *lru)
/* /*
* It wont release any space if we cannot release the last * It wont release any space if we cannot release the last
* reference, besides, if somebody else has a reference, * reference, besides, if somebody else has a reference,
* it's a bad idea to nuke this object anyway. * it's a bad idea to nuke this object anyway. Also do not
* touch busy objects.
*/ */
if (oc->refcnt == 1) if (oc->refcnt == 1 && !(oc->flags & OC_F_BUSY))
break; break;
} }
if (oc != NULL) { if (oc != NULL) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment