openstack
/
trove
Code Issues Proposed changes

Merge "Allow tunable for guest agent process timeout"

This commit is contained in:
Zuul 2017-11-17 01:33:48 +00:00 committed by Gerrit Code Review
parent 12d03292b9 5ddf6b3e80
commit 536b64da27
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
trove/common/cfg.py
View File

@ -168,6 +168,9 @@ common_opts = [
cfg.IntOpt('agent_replication_snapshot_timeout', default=36000,
help='Maximum time (in seconds) to wait for taking a Guest '
'Agent replication snapshot.'),
cfg.IntOpt('command_process_timeout', default=30,
help='Maximum time (in seconds) to wait for out of process '
'commands to complete.'),
# The guest_id opt definition must match the one in cmd/guest.py
cfg.StrOpt('guest_id', default=None, help="ID of the Guest Instance."),
cfg.IntOpt('state_change_wait_time', default=60 * 10,

2
trove/common/utils.py
View File

@ -228,7 +228,7 @@ def get_id_from_href(href):
def execute_with_timeout(*args, **kwargs):
time = kwargs.pop('timeout', 30)
time = kwargs.pop('timeout', CONF.command_process_timeout)
log_output_on_error = kwargs.pop('log_output_on_error', False)
timeout = Timeout(time)