Ema has uploaded a new change for review. https://gerrit.wikimedia.org/r/306647
Change subject: 4.1.3-1wm2: Drop 0003-varnishd-nukelru.patch ...................................................................... 4.1.3-1wm2: Drop 0003-varnishd-nukelru.patch Change-Id: Ic2d2ea3670eecfe5e0ff626f372d36016cfc135c --- M debian/changelog D debian/patches/0003-varnishd-nukelru.patch M debian/patches/series 3 files changed, 8 insertions(+), 33 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/varnish4 refs/changes/47/306647/1 diff --git a/debian/changelog b/debian/changelog index d4bca4d..47dbd19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +varnish (4.1.3-1wm2) jessie-wikimedia; urgency=medium + + * Drop 0003-varnishd-nukelru.patch. The patch is responsible for varnishd + crashes and is not necessary. It's ok for NukeOne not to always free space, + that's what nuke_limit is for. + + -- Emanuele Rocca <[email protected]> Thu, 25 Aug 2016 11:20:35 +0200 + varnish (4.1.3-1wm1) jessie-wikimedia; urgency=medium * Drop patches included upstream: diff --git a/debian/patches/0003-varnishd-nukelru.patch b/debian/patches/0003-varnishd-nukelru.patch deleted file mode 100644 index ca1fe73..0000000 --- a/debian/patches/0003-varnishd-nukelru.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Brandon Black <[email protected]> -Date: Tue, 05 Apr 2016 11:35:18 +0000 -Subject: varnishd-nukelru - -Log a message when EXP_NukeOne can't destroy an object. ---- - bin/varnishd/cache/cache_expire.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/bin/varnishd/cache/cache_expire.c b/bin/varnishd/cache/cache_expire.c -index 5c27d07..327a119 100644 ---- a/bin/varnishd/cache/cache_expire.c -+++ b/bin/varnishd/cache/cache_expire.c -@@ -33,6 +33,7 @@ - #include "config.h" - - #include <stdlib.h> -+#include <stdio.h> - - #include "cache.h" - -@@ -376,7 +377,9 @@ EXP_NukeOne(struct worker *wrk, struct lru *lru) - exp_mail_it(oc); - - VSLb(wrk->vsl, SLT_ExpKill, "LRU x=%u", ObjGetXID(wrk, oc)); -- (void)HSH_DerefObjCore(wrk, &oc); -+ oc2 = oc; -+ if (HSH_DerefObjCore(wrk, &oc) != 0) -+ printf("Could not destroy object %u in EXP_NukeOne\n", ObjGetXID(wrk, oc2)); - return (1); - } - diff --git a/debian/patches/series b/debian/patches/series index 58c34d7..f218f25 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ 0001-varnishd-persistent-addrarg.patch 0002-varnishd-persistent-fallocate.patch -0003-varnishd-nukelru.patch 0004-varnishd-persistent-mmap-exit.patch -- To view, visit https://gerrit.wikimedia.org/r/306647 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic2d2ea3670eecfe5e0ff626f372d36016cfc135c Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/varnish4 Gerrit-Branch: debian-wmf Gerrit-Owner: Ema <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
