From bdd0d7ec7b55d2a3752b8e5f6503165061ee8dca Mon Sep 17 00:00:00 2001 From: Gregory Thiemonge Date: Mon, 14 Mar 2022 11:55:04 +0100 Subject: [PATCH] Increase stop_grace_period for Octavia controller services The stop_grace_period for Octavia should be greater than the longest task executed by Octavia. The timeout of longest task in Octavia is currently set to 10 minutes [0]. Updating the stop_grace_period from 5min to 10min30 will prevent failures during updates. If a really long task is running Octavia (for instance a failover during a network outage), it will timeout in Octavia and Octavia will exit gracefully. [0] https://review.opendev.org/c/openstack/octavia/+/637077 Change-Id: I05cd4a54c35479ca06580f541042948f69c7f532 (cherry picked from commit 15744039dc00cb586f656ffe04d7105608f1ccb4) (cherry picked from commit d9eb7896504f2ff4932ada00abf0c101ebf9ffac) --- deployment/octavia/octavia-health-manager-container-puppet.yaml | 2 +- deployment/octavia/octavia-housekeeping-container-puppet.yaml | 2 +- deployment/octavia/octavia-worker-container-puppet.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deployment/octavia/octavia-health-manager-container-puppet.yaml b/deployment/octavia/octavia-health-manager-container-puppet.yaml index b399b7878c..bba3f9f14a 100644 --- a/deployment/octavia/octavia-health-manager-container-puppet.yaml +++ b/deployment/octavia/octavia-health-manager-container-puppet.yaml @@ -161,7 +161,7 @@ outputs: map_merge: - octavia_health_manager: start_order: 2 - stop_grace_period: 300 + stop_grace_period: 630 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 7dc53f2f8b..a0c4753ff0 100644 --- a/deployment/octavia/octavia-housekeeping-container-puppet.yaml +++ b/deployment/octavia/octavia-housekeeping-container-puppet.yaml @@ -131,7 +131,7 @@ outputs: step_5: octavia_housekeeping: start_order: 2 - stop_grace_period: 300 + stop_grace_period: 630 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 3bd5426434..a3a6b420cd 100644 --- a/deployment/octavia/octavia-worker-container-puppet.yaml +++ b/deployment/octavia/octavia-worker-container-puppet.yaml @@ -119,7 +119,7 @@ outputs: step_5: octavia_worker: start_order: 2 - stop_grace_period: 300 + stop_grace_period: 630 image: *octavia_worker_image net: host privileged: false