Ema has submitted this change and it was merged. Change subject: 4.1.3-1wm3: Add 0005-remove_bad_extrachance_code.patch ......................................................................
4.1.3-1wm3: Add 0005-remove_bad_extrachance_code.patch Bug: T150247 Change-Id: I7d61866e921186c10427c63efe37e2c4d463463a --- M debian/changelog A debian/patches/0005-remove_bad_extrachance_code.patch M debian/patches/series 3 files changed, 54 insertions(+), 0 deletions(-) Approvals: Ema: Looks good to me, approved jenkins-bot: Verified diff --git a/debian/changelog b/debian/changelog index 47dbd19..297cfc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +varnish (4.1.3-1wm3) jessie-wikimedia; urgency=medium + + * Add 0005-remove_bad_extrachance_code.patch: the extrachance code is + creating issues with RB. Bug: #T150247 + + -- Emanuele Rocca <[email protected]> Tue, 08 Nov 2016 11:39:40 +0100 + varnish (4.1.3-1wm2) jessie-wikimedia; urgency=medium * Drop 0003-varnishd-nukelru.patch. The patch is responsible for varnishd diff --git a/debian/patches/0005-remove_bad_extrachance_code.patch b/debian/patches/0005-remove_bad_extrachance_code.patch new file mode 100644 index 0000000..d159f8a --- /dev/null +++ b/debian/patches/0005-remove_bad_extrachance_code.patch @@ -0,0 +1,46 @@ +From: Brandon Black <[email protected]> +Date: Tue Nov 8 11:59:43 UTC 2016 +Subject: remove_bad_extrachance_code + +Bug: T150247 +diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c +index 039d3b2..f88bf8e 100644 +--- a/bin/varnishd/cache/cache_backend.c ++++ b/bin/varnishd/cache/cache_backend.c +@@ -177,7 +177,7 @@ static int __match_proto__(vdi_gethdrs_f) + vbe_dir_gethdrs(const struct director *d, struct worker *wrk, + struct busyobj *bo) + { +- int i, extrachance = 1; ++ int i; /*, extrachance = 1;*/ + struct backend *bp; + struct vbc *vbc; + +@@ -201,8 +201,10 @@ vbe_dir_gethdrs(const struct director *d, struct worker *wrk, + return (-1); + } + AN(bo->htc); ++ /* + if (vbc->state != VBC_STATE_STOLEN) + extrachance = 0; ++ */ + + i = V1F_SendReq(wrk, bo, &bo->acct.bereq_hdrbytes, 0); + +@@ -225,6 +227,7 @@ vbe_dir_gethdrs(const struct director *d, struct worker *wrk, + */ + vbe_dir_finish(d, wrk, bo); + AZ(bo->htc); ++ /* + if (i < 0) + break; + if (bo->req != NULL && +@@ -232,7 +235,8 @@ vbe_dir_gethdrs(const struct director *d, struct worker *wrk, + bo->req->req_body_status != REQ_BODY_CACHED) + break; + VSC_C_main->backend_retry++; +- } while (extrachance); ++ } while (extrachance);*/ ++ } while (0); + return (-1); + } diff --git a/debian/patches/series b/debian/patches/series index f218f25..273c363 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 0001-varnishd-persistent-addrarg.patch 0002-varnishd-persistent-fallocate.patch 0004-varnishd-persistent-mmap-exit.patch +0005-remove_bad_extrachance_code.patch -- To view, visit https://gerrit.wikimedia.org/r/320371 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7d61866e921186c10427c63efe37e2c4d463463a Gerrit-PatchSet: 4 Gerrit-Project: operations/debs/varnish4 Gerrit-Branch: debian-wmf Gerrit-Owner: Ema <[email protected]> Gerrit-Reviewer: Ema <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
