openstack
/
deb-heat
Code Issues Proposed changes

Merge "Corrected max secs for concurrent trans retries" into stable/ocata

This commit is contained in:
Jenkins 2017-05-19 10:57:40 +00:00 committed by Gerrit Code Review
parent d0309937b3 416bad4325
commit 6ebcfb3fe8
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
heat/engine/service_software_config.py
View File

@ -102,6 +102,7 @@ class SoftwareConfigService(object):
rs = db_api.resource_get_by_physical_resource_id(cnxt, server_id)
if not rs:
return
cnxt.session.refresh(rs)
deployments = self.metadata_software_deployments(cnxt, server_id)
md = rs.rsrc_metadata or {}
md['deployments'] = deployments

2
heat/objects/resource.py
View File

@ -42,7 +42,7 @@ LOG = logging.getLogger(__name__)
def retry_on_conflict(func):
wrapper = tenacity.retry(
stop=tenacity.stop_after_attempt(11),
wait=tenacity.wait_random(max=0.002),
wait=tenacity.wait_random(max=2),
retry=tenacity.retry_if_exception_type(
exception.ConcurrentTransaction),
reraise=True)

35
heat/tests/engine/service/test_software_config.py
View File

@ -649,8 +649,9 @@ class SoftwareConfigServiceTest(common.HeatTestCase):
'deployments': {'deploy': 'this'}
}
self.engine.software_config._push_metadata_software_deployments(
self.ctx, '1234', None)
with mock.patch.object(self.ctx.session, 'refresh'):
self.engine.software_config._push_metadata_software_deployments(
self.ctx, '1234', None)
res_upd.assert_called_once_with(
self.ctx, '1234', {'rsrc_metadata': result_metadata}, 1)
put.side_effect = Exception('Unexpected requests.put')
@ -674,12 +675,14 @@ class SoftwareConfigServiceTest(common.HeatTestCase):
deployments = {'deploy': 'this'}
md_sd.return_value = deployments
self.assertRaises(
exception.ConcurrentTransaction,
self.engine.software_config._push_metadata_software_deployments,
self.ctx,
'1234',
None)
with mock.patch.object(self.ctx.session, 'refresh'):
f = self.engine.software_config._push_metadata_software_deployments
self.assertRaises(
exception.ConcurrentTransaction,
f,
self.ctx,
'1234',
None)
# retry ten times then the final failure
self.assertEqual(11, res_upd.call_count)
put.assert_not_called()
@ -709,9 +712,9 @@ class SoftwareConfigServiceTest(common.HeatTestCase):
'original': 'metadata',
'deployments': {'deploy': 'this'}
}
self.engine.software_config._push_metadata_software_deployments(
self.ctx, '1234', None)
with mock.patch.object(self.ctx.session, 'refresh'):
self.engine.software_config._push_metadata_software_deployments(
self.ctx, '1234', None)
res_upd.assert_called_once_with(
self.ctx, '1234', {'rsrc_metadata': result_metadata}, 1)
@ -748,8 +751,9 @@ class SoftwareConfigServiceTest(common.HeatTestCase):
'deployments': {'deploy': 'this'}
}
self.engine.software_config._push_metadata_software_deployments(
self.ctx, '1234', 'project1')
with mock.patch.object(self.ctx.session, 'refresh'):
self.engine.software_config._push_metadata_software_deployments(
self.ctx, '1234', 'project1')
res_upd.assert_called_once_with(
self.ctx, '1234', {'rsrc_metadata': result_metadata}, 1)
@ -917,8 +921,9 @@ class SoftwareConfigServiceTest(common.HeatTestCase):
zaqar_client.queue.return_value = queue
queue.pop.return_value = [mock.Mock(body='ok')]
deployment = self._create_software_deployment(
status='IN_PROGRESS', config_id=config['id'])
with mock.patch.object(self.ctx.session, 'refresh'):
deployment = self._create_software_deployment(
status='IN_PROGRESS', config_id=config['id'])
deployment_id = deployment['id']
self.assertEqual(