From 36f9cc78c88b377092cebca5b11f451af35f4f10 Mon Sep 17 00:00:00 2001 From: Gregory Thiemonge Date: Mon, 9 Dec 2019 14:43:02 +0100 Subject: [PATCH] Set octavia services' stop grace period to 300sec Octavia worker, house-keeping and health-monitor serivices may use some long taskflow's flows to handle load balancers and amphorae (launch VMs, etc...). Those flows should not be interrupted when restarting those services (i.e when updating an overcloud, or restarting services because of certificates rotation), it might cause resource leaks that cannot be fixed by an admin. As default container stop timeout is defined to 10 seconds, this timeout value needs to be increased for octavia services (except octavia api) to ensure a graceful shutdown. This new value has been set to 300 seconds according to the octavia worker default configuration introduced in https://review.opendev.org/#/c/684201/ Closes-Bug: #1855684 Change-Id: I8911a79328769c910d03168cfa5a421d0dd0f9b6 (cherry picked from commit c595835776eccbc2f59b69574f0aa5c3e87c9bd5) --- deployment/octavia/octavia-health-manager-container-puppet.yaml | 1 + deployment/octavia/octavia-housekeeping-container-puppet.yaml | 1 + deployment/octavia/octavia-worker-container-puppet.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/deployment/octavia/octavia-health-manager-container-puppet.yaml b/deployment/octavia/octavia-health-manager-container-puppet.yaml index 628aba1f1a..8a77bff3bc 100644 --- a/deployment/octavia/octavia-health-manager-container-puppet.yaml +++ b/deployment/octavia/octavia-health-manager-container-puppet.yaml @@ -132,6 +132,7 @@ outputs: step_5: octavia_health_manager: start_order: 2 + stop_grace_period: 300 image: *octavia_health_manager_image net: host privileged: false diff --git a/deployment/octavia/octavia-housekeeping-container-puppet.yaml b/deployment/octavia/octavia-housekeeping-container-puppet.yaml index cae7db7ebc..ba21eb3328 100644 --- a/deployment/octavia/octavia-housekeeping-container-puppet.yaml +++ b/deployment/octavia/octavia-housekeeping-container-puppet.yaml @@ -131,6 +131,7 @@ outputs: step_5: octavia_housekeeping: start_order: 2 + stop_grace_period: 300 image: *octavia_housekeeping_image net: host privileged: false diff --git a/deployment/octavia/octavia-worker-container-puppet.yaml b/deployment/octavia/octavia-worker-container-puppet.yaml index 2513e8d32f..b67ad9eb6b 100644 --- a/deployment/octavia/octavia-worker-container-puppet.yaml +++ b/deployment/octavia/octavia-worker-container-puppet.yaml @@ -119,6 +119,7 @@ outputs: step_5: octavia_worker: start_order: 2 + stop_grace_period: 300 image: *octavia_worker_image net: host privileged: false