BBlack has submitted this change and it was merged.
Change subject: text VCL: do not create hfp objects on 5xx
......................................................................
text VCL: do not create hfp objects on 5xx
Change-Id: Ide2b0bfd30a910788e813b0d6dc88ee2654fb339
---
M templates/varnish/text-backend.inc.vcl.erb
M templates/varnish/text-frontend.inc.vcl.erb
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/templates/varnish/text-backend.inc.vcl.erb
b/templates/varnish/text-backend.inc.vcl.erb
index 9196743..7ad8e7f 100644
--- a/templates/varnish/text-backend.inc.vcl.erb
+++ b/templates/varnish/text-backend.inc.vcl.erb
@@ -103,7 +103,7 @@
set beresp.ttl = 60 s;
}
- if (beresp.ttl <= 0s || req.http.X-Wikimedia-Debug == "1" ||
req.http.X-Wikimedia-Security-Audit == "1") {
+ if ((beresp.status < 500 && beresp.ttl <= 0s) ||
req.http.X-Wikimedia-Debug == "1" || req.http.X-Wikimedia-Security-Audit ==
"1") {
set beresp.ttl = 120s;
return (hit_for_pass);
}
diff --git a/templates/varnish/text-frontend.inc.vcl.erb
b/templates/varnish/text-frontend.inc.vcl.erb
index 7eef6fa..e2a52c5 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -149,7 +149,7 @@
set beresp.ttl = 60 s;
}
- if (beresp.ttl <= 0s || req.http.X-Wikimedia-Debug == "1" ||
req.http.X-Wikimedia-Security-Audit == "1") {
+ if ((beresp.status < 500 && beresp.ttl <= 0s) ||
req.http.X-Wikimedia-Debug == "1" || req.http.X-Wikimedia-Security-Audit ==
"1") {
set beresp.ttl = 120s;
return (hit_for_pass);
}
--
To view, visit https://gerrit.wikimedia.org/r/259696
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ide2b0bfd30a910788e813b0d6dc88ee2654fb339
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
