Faidon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57069
Change subject: upload varnish: switch everything to Swift
......................................................................
upload varnish: switch everything to Swift
Squids now pass everything to Swift, so remove this extra hop for
non-matching Swift URLs and divert everything from Varnishes to Swift.
Change-Id: Id5535bcae04e6f8c54c21bc46531aae9c2cf5e08
---
M manifests/role/cache.pp
M templates/varnish/upload-backend.inc.vcl.erb
2 files changed, 1 insertion(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/69/57069/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index ee5482f..1e73ceb 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -386,8 +386,7 @@
"image_scalers" =>
$lvs::configuration::lvs_service_ips[$::realm]['rendering'][$::mw_primary],
},
"eqiad" => {
- "backend" =>
$lvs::configuration::lvs_service_ips[$::realm]['upload']['pmtpa']['uploadsvc'],
- "swift" =>
$lvs::configuration::lvs_service_ips[$::realm]['swift']['pmtpa'],
+ "backend" =>
$lvs::configuration::lvs_service_ips[$::realm]['swift']['pmtpa'],
"image_scalers" =>
$lvs::configuration::lvs_service_ips[$::realm]['rendering'][$::mw_primary],
},
"esams" => {
diff --git a/templates/varnish/upload-backend.inc.vcl.erb
b/templates/varnish/upload-backend.inc.vcl.erb
index 570d15c..ca725d7 100644
--- a/templates/varnish/upload-backend.inc.vcl.erb
+++ b/templates/varnish/upload-backend.inc.vcl.erb
@@ -175,22 +175,6 @@
}
sub vcl_miss {
-<% if vcl_config.fetch("cluster_tier", "1") == "1" -%>
- # Send originals to the Swift cluster
- if ( req.url ~
"^/(wikibooks|wikinews|wikiquote|wikiversity|wikimedia|wikipedia|wikisource|wiktionary|wikivoyage)/[^/]+/(archive/)?[0-9a-f]/[0-9a-f][0-9a-f]/"
) {
- set req.backend = swift;
- # Send thumbnails to the Swift cluster
- } elsif (req.url ~ "^/+[^/]+/[^/]+/(transcoded|thumb|temp)/") {
- set req.backend = swift;
- # math to swift
- } elsif (req.url ~ "^/(math|score)/") {
- set req.backend = swift;
- # timeline to swift
- } elsif (req.url ~
"^/(wikibooks|wikinews|wikiquote|wikiversity|wikimedia|wikipedia|wikisource|wiktionary|wikivoyage)/[^/]+/timeline/")
{
- set req.backend = swift;
- }
-<% end -%>
-
/* Convert range requests into pass when over a certain threshold */
if (req.http.Range
&& (std.integer(regsub(req.http.Range, "^bytes=([0-9]*)-",
"\1"), 0) > 33554432
--
To view, visit https://gerrit.wikimedia.org/r/57069
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5535bcae04e6f8c54c21bc46531aae9c2cf5e08
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon <fai...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
