opendev/system-config
Code Issues Proposed changes

Cache static zuul resources in apache

Browse Source 
We are running zuul-web out of a container now which is forcing all http
requests through to cherrypy (eg we no longer serve static resources
from apache directly). Alleviate some of the pressure on cherrypy by
caching static resources in apache.

Change-Id: I77d0df4b4853e4dff3177862a248cdf4efa33765
This commit is contained in:
Clark Boylan 2020-04-29 17:12:27 -07:00
parent 8392caaa69
commit 8aab93a4d6
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
playbooks/roles/zuul-web/templates/openstack.vhost.j2
View File

@ -55,8 +55,9 @@
<IfModule mod_mem_cache.c> <IfModule mod_mem_cache.c>
# TODO: Should we cache the rest of the API too? # TODO: Should we cache the rest of the API too?
CacheEnable mem /api/status CacheEnable mem /api/status
# 12MByte total cache size. CacheEnable mem /static/.*
MCacheSize 12288 # 80MB max cache size. 10 objects at 8MB max each.
MCacheSize 81920
MCacheMaxObjectCount 10 MCacheMaxObjectCount 10
MCacheMinObjectSize 1 MCacheMinObjectSize 1
# 8MByte max size per cache entry # 8MByte max size per cache entry
@ -65,6 +66,7 @@
</IfModule> </IfModule>
<IfModule mod_cache_disk.c> <IfModule mod_cache_disk.c>
CacheEnable disk /api/status CacheEnable disk /api/status
CacheEnable disk /static/.*
CacheRoot /var/cache/apache2/mod_cache_disk CacheRoot /var/cache/apache2/mod_cache_disk
CacheMaxFileSize 10000000 CacheMaxFileSize 10000000
</IfModule> </IfModule>

2
playbooks/roles/zuul-web/templates/zuul.vhost.j2
View File

@ -53,6 +53,7 @@
<IfModule mod_mem_cache.c> <IfModule mod_mem_cache.c>
# TODO: Should we cache the rest of the API too? # TODO: Should we cache the rest of the API too?
CacheEnable mem /api/tenant/.*/status CacheEnable mem /api/tenant/.*/status
CacheEnable mem /static/.*
# 80MB max cache size. 10 objects at 8MB max each. # 80MB max cache size. 10 objects at 8MB max each.
MCacheSize 81920 MCacheSize 81920
MCacheMaxObjectCount 10 MCacheMaxObjectCount 10
@ -63,6 +64,7 @@
</IfModule> </IfModule>
<IfModule mod_cache_disk.c> <IfModule mod_cache_disk.c>
CacheEnable disk /api/tenant/.*/status CacheEnable disk /api/tenant/.*/status
CacheEnable disk /static/.*
CacheRoot /var/cache/apache2/mod_cache_disk CacheRoot /var/cache/apache2/mod_cache_disk
CacheMaxFileSize 10000000 CacheMaxFileSize 10000000
</IfModule> </IfModule>