BBlack has submitted this change and it was merged.
Change subject: cache_upload: remove varnish3 VCL compat
......................................................................
cache_upload: remove varnish3 VCL compat
We have been running varnish4 on cache_upload for a while, drop v3
conditionals.
Bug: T131502
Change-Id: I9f5e7563105483afc28c67df7d6f5d3ecc212989
---
M modules/varnish/templates/upload-backend.inc.vcl.erb
M modules/varnish/templates/upload-common.inc.vcl.erb
M modules/varnish/templates/upload-frontend.inc.vcl.erb
3 files changed, 0 insertions(+), 47 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/modules/varnish/templates/upload-backend.inc.vcl.erb
b/modules/varnish/templates/upload-backend.inc.vcl.erb
index c320022..b92d381 100644
--- a/modules/varnish/templates/upload-backend.inc.vcl.erb
+++ b/modules/varnish/templates/upload-backend.inc.vcl.erb
@@ -31,17 +31,9 @@
sub cluster_be_recv_applayer_backend {
if (req.url ~ "^/+[^/]+/[^/]+/thumb/") {
- <%- if @varnish_version4 -%>
set req.backend_hint = swift_thumbs.backend();
- <%- else -%>
- set req.backend = swift_thumbs;
- <%- end -%>
} else {
- <%- if @varnish_version4 -%>
set req.backend_hint = swift.backend();
- <%- else -%>
- set req.backend = swift;
- <%- end -%>
}
}
@@ -65,20 +57,11 @@
sub cluster_be_pass { }
-<% if @varnish_version4 -%>
sub cluster_be_backend_fetch {
call upload_common_set_range;
}
-<% end -%>
sub cluster_be_backend_response {
- <%- if not @varnish_version4 -%>
- // Stream large objects, >= 1 MB
- if (std.integer(beresp.http.Content-Length, 0) >= 1048576 ||
beresp.http.Content-Length ~ "^[0-9]{9}") {
- set beresp.do_stream = true;
- }
- <%- end -%>
-
call pick_stevedore;
if (beresp.http.Content-Range) {
diff --git a/modules/varnish/templates/upload-common.inc.vcl.erb
b/modules/varnish/templates/upload-common.inc.vcl.erb
index 6fd33ad..7543350 100644
--- a/modules/varnish/templates/upload-common.inc.vcl.erb
+++ b/modules/varnish/templates/upload-common.inc.vcl.erb
@@ -20,11 +20,7 @@
sub upload_common_miss {
// Convert range requests into pass
if (req.http.Range) {
- <%- if @varnish_version4 -%>
call upload_common_set_xrange;
- <%- else -%>
- set bereq.http.Range = req.http.Range;
- <%- end -%>
return (pass);
}
}
@@ -37,13 +33,11 @@
}
sub upload_common_backend_response {
-<% if @varnish_version4 -%>
// Debugging T144257. Don't cache 200 responses with CL:0.
if (beresp.http.Content-Length == "0" && beresp.status == 200) {
set beresp.ttl = 0s;
set beresp.uncacheable = true;
}
-<% end -%>
}
// Varnish strips the Range header before copying req into bereq. Save it into
diff --git a/modules/varnish/templates/upload-frontend.inc.vcl.erb
b/modules/varnish/templates/upload-frontend.inc.vcl.erb
index e9f1bd0..a63d51d 100644
--- a/modules/varnish/templates/upload-frontend.inc.vcl.erb
+++ b/modules/varnish/templates/upload-frontend.inc.vcl.erb
@@ -50,32 +50,16 @@
sub cluster_fe_pass { }
-<% if @varnish_version4 -%>
sub cluster_fe_backend_fetch {
call upload_common_set_range;
}
-<% end -%>
sub cluster_fe_backend_response {
if (beresp.http.Content-Range) {
// Varnish itself doesn't ask for ranges, so this must have been
// a passed range request
set beresp.http.X-Content-Range = beresp.http.Content-Range;
-
- <%- if not @varnish_version4 -%>
- if (beresp.http.Content-Range ~ "\/[0-9]{8,}$") {
- set beresp.do_stream = true;
- }
- <%- end -%>
}
-
- <%- if not @varnish_version4 -%>
- // Stream large objects, >= 1 or 32 MB
-<% stream_threshold = @cache_route == 'direct' ? 33554432 : 1048576 -%>
- if (std.integer(beresp.http.Content-Length, 33554432) >= <%=
stream_threshold %> || beresp.http.Content-Length ~ "^[0-9]{9}") {
- set beresp.do_stream = true;
- }
- <%- end -%>
// Four-hit-wonder experiment: if the immediate backend does not
indicate
// hit/4 or higher, deliver the object as normal but do not create a new
@@ -85,23 +69,15 @@
&& bereq.http.X-CDIS == "miss"
&& beresp.http.X-Cache-Int !~ " hit/([4-9]|[0-9]{2,})$") {
set beresp.ttl = 0s;
- <%- if @varnish_version4 -%>
set beresp.uncacheable = true;
return (deliver);
- <%- else -%>
- return (hit_for_pass);
- <%- end -%>
}
// hit-for-pass objects >= 256K size
if (std.integer(beresp.http.Content-Length, 262144) >= 262144 ||
beresp.http.Content-Length ~ "^[0-9]{9}") {
set beresp.http.X-CDIS = "pass";
- <%- if @varnish_version4 -%>
set beresp.uncacheable = true;
return (deliver);
- <%- else -%>
- return (hit_for_pass);
- <%- end -%>
}
call upload_common_backend_response;
--
To view, visit https://gerrit.wikimedia.org/r/314658
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9f5e7563105483afc28c67df7d6f5d3ecc212989
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
