openstack/openstack-ansible-os_cinder
Code Issues Proposed changes

Fix reloads for uWSGI

Browse Source 
uWSGI won't reload properly unless we use one of the built in options
for uWSGI reloads:

touch-reload
pidfile reload using uwsgi binary

This opts to use the pid file option, which uses the built in uWSGI
--reload option along with the "pidfile" option specified in the conf
file to reload the service.

Change-Id: I9dbdd75f4ac555378e6999243718d2b986071dde
This commit is contained in:
Andy McCrae
2017-08-15 17:34:53 +01:00
parent f7f45e118e
commit 009fff5471
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/cinder-systemd-init.j2
View File

@@ -15,8 +15,8 @@ ExecStart={{ item.program_override }} {{ item.program_config_options|default('')
{% else %} {% else %}
ExecStart={{ cinder_bin }}/{{ item.service_name }} {{ item.program_config_options|default('') }} --log-file=/var/log/cinder/{{ item.service_name }}.log ExecStart={{ cinder_bin }}/{{ item.service_name }} {{ item.program_config_options|default('') }} --log-file=/var/log/cinder/{{ item.service_name }}.log
{% endif %} {% endif %}
{% if item.service_name != "cinder-api" %} {% if item.service_name != "cinder-api" or item.wsgi_app %}
ExecReload=/bin/kill -HUP $MAINPID ExecReload={{ (item.wsgi_app is defined and item.wsgi_app) | ternary(cinder_bin + '/uwsgi --reload /var/run/' + item.service_name + '/' + item.service_name +'.pid','/bin/kill -HUP $MAINPID') }}
{% endif %} {% endif %}
# Give a reasonable amount of time for the server to start up/shut down # Give a reasonable amount of time for the server to start up/shut down

5
templates/cinder-uwsgi.ini.j2
View File

@@ -4,16 +4,17 @@ gid = {{ cinder_system_group_name }}
virtualenv = /openstack/venvs/cinder-{{ cinder_venv_tag }} virtualenv = /openstack/venvs/cinder-{{ cinder_venv_tag }}
wsgi-file = {{ cinder_bin }}/{{ item.wsgi_name }} wsgi-file = {{ cinder_bin }}/{{ item.wsgi_name }}
http-socket = {{ item.uwsgi_bind_address }}:{{ item.uwsgi_port }} http = {{ item.uwsgi_bind_address }}:{{ item.uwsgi_port }}
master = true master = true
enable-threads = true enable-threads = true
processes = {{ cinder_wsgi_processes }} processes = {{ cinder_wsgi_processes }}
threads = {{ cinder_wsgi_threads }} threads = {{ cinder_wsgi_threads }}
exit-on-reload = true exit-on-reload = false
die-on-term = true die-on-term = true
lazy-apps = true lazy-apps = true
add-header = Connection: close add-header = Connection: close
buffer-size = {{ cinder_wsgi_buffer_size }} buffer-size = {{ cinder_wsgi_buffer_size }}
thunder-lock = true thunder-lock = true
logfile-chmod = 644 logfile-chmod = 644
pidfile = /var/run/{{ item.service_name }}/{{ item.service_name }}.pid