From 397cbe0747d8f192d2b9f4416da7ffc4fd15b0af Mon Sep 17 00:00:00 2001 From: Rafael Camargos Date: Wed, 22 Sep 2021 09:52:39 -0300 Subject: [PATCH] Increase Backup&Restore lifecycle actions timeout With the inclusion of the recreation of nginx ingress controller admission webhook on backup and restore it became necessary to increase the B&R lifecycle actions timeout, given that these operations are done synchronously and requires a full reapply of the Nginx Ingress Controller helm application. Note that in terms of which RPC method calls which lifecycle action, these are mapped like: - backup_restore_lifecycle_actions(): pre/post-backup lifecycle actions - complete_restore(): post-restore lifecycle action Partial-Bug: 1943835 Change-Id: I020c54b56820465b33acb91c05aee7cc1e805259 Signed-off-by: Rafael Camargos --- sysinv/sysinv/sysinv/sysinv/conductor/rpcapi.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sysinv/sysinv/sysinv/sysinv/conductor/rpcapi.py b/sysinv/sysinv/sysinv/sysinv/conductor/rpcapi.py index 62b19cc8f3..a6ee0483bc 100644 --- a/sysinv/sysinv/sysinv/sysinv/conductor/rpcapi.py +++ b/sysinv/sysinv/sysinv/sysinv/conductor/rpcapi.py @@ -1903,8 +1903,11 @@ class ConductorAPI(sysinv.openstack.common.rpc.proxy.RpcProxy): :param success: True if the operation was successful, False if it fails. used in post-*-action to indicate that an operation in progress failed. """ - return self.call(context, self.make_msg('backup_restore_lifecycle_actions', - operation=operation, success=success)) + return self.call( + context, + self.make_msg('backup_restore_lifecycle_actions', operation=operation, success=success), + timeout=120, + ) def perform_app_upload(self, context, rpc_app, tarfile, lifecycle_hook_info, images=False): """Handle application upload request @@ -2194,7 +2197,7 @@ class ConductorAPI(sysinv.openstack.common.rpc.proxy.RpcProxy): :param context: request context. """ - return self.call(context, self.make_msg('complete_restore')) + return self.call(context, self.make_msg('complete_restore'), timeout=120) def get_restore_state(self, context): """Get the restore state