From 141c9100c311e767ec860dc44f7259986e376900 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 26 Apr 2017 11:35:19 +0100 Subject: [PATCH] Reduce init restart/kill times 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 *_init_config_overrides variables which use the config_template task to change template defaults. Change-Id: Ib20bb6b939837b660a8d57ae1c8cdb6dcdf286a1 (cherry picked from commit c091e28c5c1cfd0602cb0050086d3093c1f843dd) --- ...n_init_time_settings-1ef46f6b9d4fc1df.yaml | 23 +++++++++++++++++++ templates/barbican-systemd-init.j2 | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/barbican_init_time_settings-1ef46f6b9d4fc1df.yaml diff --git a/releasenotes/notes/barbican_init_time_settings-1ef46f6b9d4fc1df.yaml b/releasenotes/notes/barbican_init_time_settings-1ef46f6b9d4fc1df.yaml new file mode 100644 index 0000000..a6d885e --- /dev/null +++ b/releasenotes/notes/barbican_init_time_settings-1ef46f6b9d4fc1df.yaml @@ -0,0 +1,23 @@ +--- +features: + - For the ``os_barbican`` 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 + ``barbican_*_init_config_overrides`` variables which use the + ``config_template`` task to change template defaults. +upgrade: + - For the ``os_barbican`` 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 + ``barbican_*_init_config_overrides`` variables which use the + ``config_template`` task to change template defaults. diff --git a/templates/barbican-systemd-init.j2 b/templates/barbican-systemd-init.j2 index 5e2ab83..6d170f6 100644 --- a/templates/barbican-systemd-init.j2 +++ b/templates/barbican-systemd-init.j2 @@ -17,9 +17,9 @@ ExecStart={{ barbican_bin }}/{{ program_name }} {{ program_config_options|defaul {% 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 services will operate from # The accounting options give us the ability to see resource usage through