openstack
/
openstack-ansible-os_designate
Code Issues Proposed changes

Merge "Reduce init restart/kill times" into stable/ocata

This commit is contained in:
Jenkins 2017-05-22 19:35:59 +00:00 committed by Gerrit Code Review
parent 25e8995640 3a2955cd26
commit d01b6ea075
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
releasenotes/notes/designate_init_time_settings-6efb66b0d17d4c04.yaml Normal file
View File

@ -0,0 +1,23 @@
---
features:
- For the ``os_designate`` role, the systemd unit ``TimeoutSec`` value which
controls the time between sending a SIGTERM signal and a SIGKILL signal
when stopping or restarting the service has been reduced from 300 seconds
to 120 seconds. This provides 2 minutes for long-lived sessions to drain
while preventing new ones from starting before a restart or a stop. The
``RestartSec`` value which controls the time between the service stop and
start when restarting has been reduced from 150 seconds to 2 seconds to
make the restart happen faster. These values can be adjusted by using the
``designate_*_init_config_overrides`` variables which use the
``config_template`` task to change template defaults.
upgrade:
- For the ``os_designate`` role, the systemd unit ``TimeoutSec`` value which
controls the time between sending a SIGTERM signal and a SIGKILL signal
when stopping or restarting the service has been reduced from 300 seconds
to 120 seconds. This provides 2 minutes for long-lived sessions to drain
while preventing new ones from starting before a restart or a stop. The
``RestartSec`` value which controls the time between the service stop and
start when restarting has been reduced from 150 seconds to 2 seconds to
make the restart happen faster. These values can be adjusted by using the
``designate_*_init_config_overrides`` variables which use the
``config_template`` task to change template defaults.

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

@ -17,9 +17,9 @@ ExecStart={{ designate_bin }}/{{ item.value.service_name }} {{ program_config_op
{% endif %}
# Give a reasonable amount of time for the server to start up/shut down
TimeoutSec=300
TimeoutSec=120
Restart=on-failure
RestartSec=150
RestartSec=2
# This creates a specific slice which all designate services will operate from
# The accounting options give us the ability to see resource usage through