Faidon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/67835
Change subject: Swift rewrite.py: get rid of shard_containers
......................................................................
Swift rewrite.py: get rid of shard_containers
Keep shard_container_list, but get rid of the supplementary-but-useless
shard_containers option.
Change-Id: I08773040671097d81d7865ac388d84955d290fb8
---
M files/swift/SwiftMedia/wmf/rewrite.py
M manifests/role/swift.pp
M manifests/swift.pp
M templates/swift/proxy-server.conf.erb
4 files changed, 2 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/35/67835/1
diff --git a/files/swift/SwiftMedia/wmf/rewrite.py
b/files/swift/SwiftMedia/wmf/rewrite.py
index 5a5411f..470aede 100644
--- a/files/swift/SwiftMedia/wmf/rewrite.py
+++ b/files/swift/SwiftMedia/wmf/rewrite.py
@@ -28,9 +28,6 @@
"""
def __init__(self, rewrite, conf):
- def striplist(l):
- return([x.strip() for x in l])
-
WSGIContext.__init__(self, rewrite.app)
self.app = rewrite.app
self.logger = rewrite.logger
@@ -39,10 +36,7 @@
self.thumbhost = conf['thumbhost'].strip()
self.user_agent = conf['user_agent'].strip()
self.bind_port = conf['bind_port'].strip()
- self.shard_containers = conf['shard_containers'].strip() # all, some,
none
- if (self.shard_containers == 'some'):
- # if we're supposed to shard some containers, get a cleaned list
of the containers to shard
- self.shard_container_list =
striplist(conf['shard_container_list'].split(','))
+ self.shard_container_list = [ item.strip() for item in
conf['shard_container_list'].split(',') ]
# this parameter controls whether URLs sent to the thumbhost are sent
as is (eg. upload/proj/lang/) or with the site/lang
# converted and only the path sent back (eg en.wikipedia/thumb).
self.backend_url_format = conf['backend_url_format'].strip() # asis,
sitelang
@@ -311,8 +305,7 @@
container = "%s-%s-%s-%s" % (proj, lang, repo, zone)
# Add 2-digit shard to the container if it is supposed to be
sharded.
# We may thus have an "actual" container name like
"<proj><lang><repo><zone>.<shard>"
- if ((self.shard_containers == 'all') or
- ((self.shard_containers == 'some') and (container in
self.shard_container_list))):
+ if container in self.shard_container_list:
container += ".%s" % shard
# Save a url with just the account name in it.
diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 87e7828..0e3e9c2 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -45,7 +45,6 @@
super_admin_key =>
$passwords::swift::pmtpa-prod::super_admin_key,
rewrite_account =>
"AUTH_43651b15-ed7a-40b6-b745-47666abf8dfe",
rewrite_thumb_server =>
"rendering.svc.eqiad.wmnet",
- shard_containers => "some",
shard_container_list =>
"wikipedia-commons-local-thumb,wikipedia-de-local-thumb,wikipedia-en-local-thumb,wikipedia-fi-local-thumb,wikipedia-fr-local-thumb,wikipedia-he-local-thumb,wikipedia-hu-local-thumb,wikipedia-id-local-thumb,wikipedia-it-local-thumb,wikipedia-ja-local-thumb,wikipedia-ro-local-thumb,wikipedia-ru-local-thumb,wikipedia-th-local-thumb,wikipedia-tr-local-thumb,wikipedia-uk-local-thumb,wikipedia-zh-local-thumb,wikipedia-commons-local-public,wikipedia-de-local-public,wikipedia-en-local-public,wikipedia-fi-local-public,wikipedia-fr-local-public,wikipedia-he-local-public,wikipedia-hu-local-public,wikipedia-id-local-public,wikipedia-it-local-public,wikipedia-ja-local-public,wikipedia-ro-local-public,wikipedia-ru-local-public,wikipedia-th-local-public,wikipedia-tr-local-public,wikipedia-uk-local-public,wikipedia-zh-local-public,wikipedia-commons-local-temp,wikipedia-de-local-temp,wikipedia-en-local-temp,wikipedia-fi-local-temp,wikipedia-fr-local-temp,wikipedia-he-local-temp,wikipedia-hu-local-temp,wikipedia-id-local-temp,wikipedia-it-local-temp,wikipedia-ja-local-temp,wikipedia-ro-local-temp,wikipedia-ru-local-temp,wikipedia-th-local-temp,wikipedia-tr-local-temp,wikipedia-uk-local-temp,wikipedia-zh-local-temp,wikipedia-commons-local-transcoded,wikipedia-de-local-transcoded,wikipedia-en-local-transcoded,wikipedia-fi-local-transcoded,wikipedia-fr-local-transcoded,wikipedia-he-local-transcoded,wikipedia-hu-local-transcoded,wikipedia-id-local-transcoded,wikipedia-it-local-transcoded,wikipedia-ja-local-transcoded,wikipedia-ro-local-transcoded,wikipedia-ru-local-transcoded,wikipedia-th-local-transcoded,wikipedia-tr-local-transcoded,wikipedia-uk-local-transcoded,wikipedia-zh-local-transcoded,global-data-math-render",
backend_url_format => "sitelang"
}
@@ -84,7 +83,6 @@
super_admin_key => "thiskeyissuper",
rewrite_account =>
"AUTH_f80b5643-4597-407f-94f5-d2cc051805cf",
rewrite_thumb_server => "upload.wikimedia.org",
- shard_containers => "none",
shard_container_list => "",
backend_url_format => "asis"
}
@@ -129,7 +127,6 @@
super_admin_key => "notsoseekritkey",
rewrite_account =>
"AUTH_28e2c57d-458d-4d9e-b543-17a395f632f8",
rewrite_thumb_server => "upload.wikimedia.org",
- shard_containers => "none",
shard_container_list => "",
backend_url_format => "asis"
}
diff --git a/manifests/swift.pp b/manifests/swift.pp
index c767c2f..1424fce 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -209,7 +209,6 @@
$super_admin_key,
$rewrite_account,
$rewrite_thumb_server,
- $shard_containers,
$shard_container_list,
$backend_url_format ) {
diff --git a/templates/swift/proxy-server.conf.erb
b/templates/swift/proxy-server.conf.erb
index 7fe049a..9da5b18 100644
--- a/templates/swift/proxy-server.conf.erb
+++ b/templates/swift/proxy-server.conf.erb
@@ -53,9 +53,6 @@
thumbhost = <%= scope.lookupvar("swift::proxy::config::rewrite_thumb_server")
%>
# upload doesn"t like our User-agent (Python-urllib/2.6), otherwise we could
call it using urllib2.urlopen()
user_agent = Mozilla/5.0
-# should we shard containers, and if so how many? all, none, some
-shard_containers = <%=
scope.lookupvar("swift::proxy::config::shard_containers") %>
-# if we shard some containers, which ones? ignored for all and none.
# this list is the containers that should be sharded
shard_container_list = <%=
scope.lookupvar("swift::proxy::config::shard_container_list") %>
# backend_url_format controls whether we pass the URL through to the thumbhost
unmolested
--
To view, visit https://gerrit.wikimedia.org/r/67835
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I08773040671097d81d7865ac388d84955d290fb8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
