Add config database_restore_timeout
Change-Id: I0da6b5376b4dd97606bfb75dae0fe0791cf8c47e
This commit is contained in:
parent
96c552f557
commit
177648d906
|
@ -46,6 +46,12 @@ DatabaseGroup = [
|
|||
default=1800,
|
||||
help='Timeout in seconds to wait for a database instance to '
|
||||
'build.'),
|
||||
cfg.IntOpt(
|
||||
'database_restore_timeout',
|
||||
default=3600,
|
||||
help='Timeout in seconds to wait for a database instance to '
|
||||
'be restored.'
|
||||
),
|
||||
cfg.IntOpt(
|
||||
'backup_wait_timeout',
|
||||
default=600,
|
||||
|
|
|
@ -68,7 +68,10 @@ class TestBackupBase(trove_base.BaseTroveTest):
|
|||
datastore_version=self.backup['datastore']['version'],
|
||||
backup_id=self.backup['id']
|
||||
)
|
||||
self.wait_for_instance_status(restore_instance['id'])
|
||||
self.wait_for_instance_status(
|
||||
restore_instance['id'],
|
||||
timeout=CONF.database.database_restore_timeout)
|
||||
|
||||
restore_instance = self.client.get_resource(
|
||||
"instances", restore_instance['id'])['instance']
|
||||
restore_instance_ip = self.get_instance_ip(restore_instance)
|
||||
|
@ -107,7 +110,10 @@ class TestBackupBase(trove_base.BaseTroveTest):
|
|||
datastore_version=backup_inc['datastore']['version'],
|
||||
backup_id=backup_inc['id']
|
||||
)
|
||||
self.wait_for_instance_status(restore_instance['id'])
|
||||
self.wait_for_instance_status(
|
||||
restore_instance['id'],
|
||||
timeout=CONF.database.database_restore_timeout)
|
||||
|
||||
restore_instance = self.client.get_resource(
|
||||
"instances", restore_instance['id'])['instance']
|
||||
restore_instance_ip = self.get_instance_ip(restore_instance)
|
||||
|
|
Loading…
Reference in New Issue