[prev in list] [next in list] [prev in thread] [next in thread] 

List:       varnish-commit
Subject:    [master] 9204285 Have the lurker push its VSC before sleeping.
From:       Poul-Henning Kamp <phk () FreeBSD ! org>
Date:       2016-11-28 19:23:05
Message-ID: E1cBRW5-0001MX-KK () project ! varnish-software ! com
[Download RAW message or body]


commit 9204285d9546a895d09ab392cbf9782d078b96ee
Author: Poul-Henning Kamp <phk@FreeBSD.org>
Date:   Mon Nov 28 19:21:32 2016 +0000

    Have the lurker push its VSC before sleeping.
    
    This should stabilize c00049

diff --git a/bin/varnishd/cache/cache_ban_lurker.c b/bin/varnishd/cache/cache_ban_lurker.c
index b6a5f89..3206492 100644
--- a/bin/varnishd/cache/cache_ban_lurker.c
+++ b/bin/varnishd/cache/cache_ban_lurker.c
@@ -360,6 +360,7 @@ ban_lurker(struct worker *wrk, void *priv)
 		d += VTIM_real();
 		Lck_Lock(&ban_mtx);
 		if (gen == ban_generation) {
+			Pool_Sumstat(wrk);
 			(void)Lck_CondWait(&ban_lurker_cond, &ban_mtx, d);
 			ban_batch = 0;
 		}
diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index 2a64d4f..314945c 100644
--- a/bin/varnishd/cache/cache_pool.c
+++ b/bin/varnishd/cache/cache_pool.c
@@ -138,6 +138,7 @@ pool_stat_summ(struct worker *wrk, void *priv)
 	pool_sumstat(src);
 	Lck_Unlock(&wstat_mtx);
 	memset(src, 0, sizeof *src);
+	AZ(wrk->pool->b_stat);
 	wrk->pool->b_stat = src;
 }
 

_______________________________________________
varnish-commit mailing list
varnish-commit@varnish-cache.org
https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit
[prev in list] [next in list] [prev in thread] [next in thread]