Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/251089
Change subject: Store thumbor originals in memcache ...................................................................... Store thumbor originals in memcache This is to cater for bursts of thumbnail requests with different parameters for the same original. Which are common due to prerendering/warmup at upload time. This breaks purging, which will be addressed separately. Bug: T117075 Change-Id: I90a4faf1bf3db95d8dfad3b450641b8208d789d6 --- M puppet/modules/role/manifests/thumbor.pp M puppet/modules/thumbor/manifests/init.pp M puppet/modules/thumbor/templates/thumbor.conf.erb 3 files changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/89/251089/1 diff --git a/puppet/modules/role/manifests/thumbor.pp b/puppet/modules/role/manifests/thumbor.pp index 338e9ea..3440703 100644 --- a/puppet/modules/role/manifests/thumbor.pp +++ b/puppet/modules/role/manifests/thumbor.pp @@ -9,6 +9,7 @@ include ::apache::mod::proxy_http include ::apache::mod::headers include ::role::statsd + include ::role::memcached mediawiki::settings { 'thumbor-repo': values => template('role/thumbor/local_repo.php.erb'), diff --git a/puppet/modules/thumbor/manifests/init.pp b/puppet/modules/thumbor/manifests/init.pp index 611cd9f..9cad06e 100644 --- a/puppet/modules/thumbor/manifests/init.pp +++ b/puppet/modules/thumbor/manifests/init.pp @@ -43,6 +43,7 @@ 'cv2', 'numpy', 'opencv-engine', + 'pylibmc', # For memcache original file storage ], require => [ Package['libjpeg-progs'], diff --git a/puppet/modules/thumbor/templates/thumbor.conf.erb b/puppet/modules/thumbor/templates/thumbor.conf.erb index 2ead6f8..718a9ce 100644 --- a/puppet/modules/thumbor/templates/thumbor.conf.erb +++ b/puppet/modules/thumbor/templates/thumbor.conf.erb @@ -138,7 +138,7 @@ ## The file storage thumbor should use to store original images. This must be the ## full name of a python module (python must be able to import it) ## Defaults to: thumbor.storages.file_storage -#STORAGE = 'thumbor.storages.file_storage' +STORAGE = 'thumbor.storages.memcache_storage' ## The result storage thumbor should use to store generated images. This must be ## the full name of a python module (python must be able to import it) @@ -275,7 +275,7 @@ ## Expiration in seconds for the images in the File Storage. Defaults to one ## month ## Defaults to: 2592000 -STORAGE_EXPIRATION_SECONDS = 60 +STORAGE_EXPIRATION_SECONDS = 600 ## Indicates whether thumbor should store the signing key for each image in the ## file storage. This allows the key to be changed and old images to still be @@ -374,9 +374,9 @@ ## List of Memcache storage server hosts ## Defaults to: ['localhost:11211'] -#MEMCACHE_STORAGE_SERVERS = # [ -# 'localhost:11211', -# ] +MEMCACHE_STORAGE_SERVERS = [ + 'localhost:11211', +] ################################################################################ -- To view, visit https://gerrit.wikimedia.org/r/251089 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I90a4faf1bf3db95d8dfad3b450641b8208d789d6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Gilles <gdu...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits