openstack/rally-openstack
Code Issues Proposed changes

Merge "Fix backup create and restore scenario race problem"

Browse Source
This commit is contained in:
Jenkins 2017-02-10 14:33:15 +00:00 committed by Gerrit Code Review
commit 20f4f63862
2 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rally/plugins/openstack/scenarios/cinder/utils.py
View File

@ -42,7 +42,14 @@ CINDER_BENCHMARK_OPTS = [
cfg.FloatOpt("cinder_volume_delete_poll_interval",
default=2.0,
help="Interval between checks when waiting for volume"
" deletion.")
" deletion."),
cfg.FloatOpt("cinder_backup_restore_timeout",
default=600.0,
help="Time to wait for cinder backup to be restored."),
cfg.FloatOpt("cinder_backup_restore_poll_interval",
default=2.0,
help="Interval between checks when waiting for backup"
" restoring."),
]
CONF = cfg.CONF
@ -369,6 +376,14 @@ class CinderScenario(scenario.OpenStackScenario):
"""
restore = self.clients("cinder").restores.restore(backup_id, volume_id)
restored_volume = self.clients("cinder").volumes.get(restore.volume_id)
backup_for_restore = self.clients("cinder").backups.get(backup_id)
bench_utils.wait_for(
backup_for_restore,
ready_statuses=["available"],
update_resource=bench_utils.get_from_manager(),
timeout=CONF.benchmark.cinder_backup_restore_timeout,
check_interval=CONF.benchmark.cinder_backup_restore_poll_interval
)
return bench_utils.wait_for(
restored_volume,
ready_statuses=["available"],

28
tests/unit/plugins/openstack/scenarios/cinder/test_utils.py
View File

@ -323,21 +323,33 @@ class CinderScenarioTestCase(test.ScenarioTestCase):
"cinder.delete_backup")
def test__restore_backup(self):
# NOTE(mdovgal): added for pep8 visual indent test passing
bench_cfg = cfg.CONF.benchmark
backup = mock.Mock()
restore = mock.Mock()
self.clients("cinder").restores.restore.return_value = backup
self.clients("cinder").backups.get.return_value = backup
self.clients("cinder").volumes.get.return_value = restore
return_restore = self.scenario._restore_backup(backup.id, None)
self.mock_wait_for.mock.assert_has_calls([
mock.call(
backup,
ready_statuses=["available"],
update_resource=self.mock_get_from_manager.mock.return_value,
timeout=bench_cfg.cinder_backup_restore_timeout,
check_interval=bench_cfg.cinder_backup_restore_poll_interval),
mock.call(
restore,
ready_statuses=["available"],
update_resource=self.mock_get_from_manager.mock.return_value,
timeout=bench_cfg.cinder_volume_create_timeout,
check_interval=bench_cfg.cinder_volume_create_poll_interval)
])
self.mock_wait_for.mock.assert_called_once_with(
restore,
ready_statuses=["available"],
update_resource=self.mock_get_from_manager.mock.return_value,
timeout=cfg.CONF.benchmark.cinder_volume_create_timeout,
check_interval=cfg.CONF.benchmark
.cinder_volume_create_poll_interval)
self.mock_get_from_manager.mock.assert_called_once_with()
self.mock_get_from_manager.mock.assert_has_calls([mock.call(),
mock.call()])
self.assertEqual(self.mock_wait_for.mock.return_value, return_restore)
self._test_atomic_action_timer(self.scenario.atomic_actions(),
"cinder.restore_backup")