Merge "Increase Backup&Restore lifecycle actions timeout"
This commit is contained in:
commit
c128157999
@ -1903,8 +1903,11 @@ class ConductorAPI(sysinv.openstack.common.rpc.proxy.RpcProxy):
|
|||||||
:param success: True if the operation was successful, False if it fails.
|
:param success: True if the operation was successful, False if it fails.
|
||||||
used in post-*-action to indicate that an operation in progress failed.
|
used in post-*-action to indicate that an operation in progress failed.
|
||||||
"""
|
"""
|
||||||
return self.call(context, self.make_msg('backup_restore_lifecycle_actions',
|
return self.call(
|
||||||
operation=operation, success=success))
|
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):
|
def perform_app_upload(self, context, rpc_app, tarfile, lifecycle_hook_info, images=False):
|
||||||
"""Handle application upload request
|
"""Handle application upload request
|
||||||
@ -2194,7 +2197,7 @@ class ConductorAPI(sysinv.openstack.common.rpc.proxy.RpcProxy):
|
|||||||
|
|
||||||
:param context: request context.
|
: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):
|
def get_restore_state(self, context):
|
||||||
"""Get the restore state
|
"""Get the restore state
|
||||||
|
Loading…
Reference in New Issue
Block a user