BBlack has submitted this change and it was merged. Change subject: Revert "Revert "cache_misc: do not deliver expired cached objects"" ......................................................................
Revert "Revert "cache_misc: do not deliver expired cached objects"" This reverts commit e5e43a3a3a7cd594856da4bac79b5d4c78bcf16b. Change-Id: Ib0cf50f44fc689cde352e2c39aa3384f463f7738 --- M templates/varnish/misc-backend.inc.vcl.erb M templates/varnish/misc-frontend.inc.vcl.erb 2 files changed, 16 insertions(+), 2 deletions(-) Approvals: Ema: Looks good to me, but someone else must approve BBlack: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/varnish/misc-backend.inc.vcl.erb b/templates/varnish/misc-backend.inc.vcl.erb index 322e86c..3127c8c 100644 --- a/templates/varnish/misc-backend.inc.vcl.erb +++ b/templates/varnish/misc-backend.inc.vcl.erb @@ -33,7 +33,14 @@ } sub cluster_be_hash { } -sub cluster_be_hit { } + +sub cluster_be_hit { + # XXX debugging v4 CL:0 issues + if (obj.ttl < 0s) { + return (miss); + } +} + sub cluster_be_miss { } sub cluster_be_pass { } diff --git a/templates/varnish/misc-frontend.inc.vcl.erb b/templates/varnish/misc-frontend.inc.vcl.erb index 85e882d..f951f37 100644 --- a/templates/varnish/misc-frontend.inc.vcl.erb +++ b/templates/varnish/misc-frontend.inc.vcl.erb @@ -31,7 +31,14 @@ } sub cluster_fe_hash { } -sub cluster_fe_hit { } + +sub cluster_fe_hit { + # XXX debugging v4 CL:0 issues + if (obj.ttl < 0s) { + return (miss); + } +} + sub cluster_fe_miss { } sub cluster_fe_pass { } sub cluster_fe_backend_response { } -- To view, visit https://gerrit.wikimedia.org/r/289230 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib0cf50f44fc689cde352e2c39aa3384f463f7738 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack <bbl...@wikimedia.org> Gerrit-Reviewer: BBlack <bbl...@wikimedia.org> Gerrit-Reviewer: Ema <e...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits