[master] 3289723 Handle out of storage on conditional bg fetches

Poul-Henning Kamp phk at FreeBSD.org
Mon Jan 6 21:03:09 CET 2014


commit 3289723cc30b6a86ab77843d1055b606b1c1e83c
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Jan 6 20:02:52 2014 +0000

    Handle out of storage on conditional bg fetches

diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index bb6c7b2..a33f152 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -615,10 +615,10 @@ vbf_stp_condfetch(struct worker *wrk, struct busyobj *bo)
 	do {
 		ois = ObjIter(oi, &sp, &sl);
 		while (sl > 0) {
-			if (st == NULL) {
+			if (st == NULL)
 				st = VFP_GetStorage(bo, bo->ims_obj->len - al);
-				XXXAN(st);
-			}
+			if (st == NULL)
+				break;
 			tl = sl;
 			if (tl > st->space - st->len)
 				tl = st->space - st->len;



More information about the varnish-commit mailing list