openstack/heat
Code Issues Proposed changes

Merge "Convergence: Consider resources from old template"

Browse Source
This commit is contained in:
Jenkins 2016-02-12 10:36:02 +00:00 committed by Gerrit Code Review
commit 19e9ace7c1
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
heat/engine/stack.py
View File

@ -1213,6 +1213,12 @@ class Stack(collections.Mapping):
self.prev_raw_template_id): self.prev_raw_template_id):
# Current resource is otherwise a good candidate # Current resource is otherwise a good candidate
candidate = ext_rsrc candidate = ext_rsrc
elif candidate is None:
# In multiple concurrent updates, if candidate is not
# found in current/previous template, it could be found
# in old tmpl.
candidate = ext_rsrc
return candidate return candidate
def _update_or_store_resources(self): def _update_or_store_resources(self):

19
heat/tests/test_convg_stack.py
View File

@ -416,7 +416,7 @@ class StackConvergenceCreateUpdateDeleteTest(common.HeatTestCase):
convergence=True) convergence=True)
stack.store() stack.store()
stack.prev_raw_template_id = 2 stack.prev_raw_template_id = 2
stack.t.id = 1 stack.t.id = 3
dummy_res = stack.resources['A'] dummy_res = stack.resources['A']
a_res_2 = res.Resource('A', dummy_res.t, stack) a_res_2 = res.Resource('A', dummy_res.t, stack)
a_res_2.current_template_id = 2 a_res_2.current_template_id = 2
@ -432,17 +432,24 @@ class StackConvergenceCreateUpdateDeleteTest(common.HeatTestCase):
1: a_res_1} 1: a_res_1}
stack.ext_rsrcs_db = existing_res stack.ext_rsrcs_db = existing_res
best_res = stack._get_best_existing_rsrc_db('A') best_res = stack._get_best_existing_rsrc_db('A')
# should return resource with template id 1 which is current template # should return resource with template id 3 which is current template
self.assertEqual(a_res_1.id, best_res.id) self.assertEqual(a_res_3.id, best_res.id)
# no resource with current template id as 1 # no resource with current template id as 3
existing_res = {2: a_res_2, existing_res = {1: a_res_1,
3: a_res_3} 2: a_res_2}
stack.ext_rsrcs_db = existing_res stack.ext_rsrcs_db = existing_res
best_res = stack._get_best_existing_rsrc_db('A') best_res = stack._get_best_existing_rsrc_db('A')
# should return resource with template id 2 which is prev template # should return resource with template id 2 which is prev template
self.assertEqual(a_res_2.id, best_res.id) self.assertEqual(a_res_2.id, best_res.id)
# no resource with current template id as 3 or 2
existing_res = {1: a_res_1}
stack.ext_rsrcs_db = existing_res
best_res = stack._get_best_existing_rsrc_db('A')
# should return resource with template id 1 existing in DB
self.assertEqual(a_res_1.id, best_res.id)
@mock.patch.object(parser.Stack, '_converge_create_or_update') @mock.patch.object(parser.Stack, '_converge_create_or_update')
def test_updated_time_stack_create(self, mock_ccu, mock_cr): def test_updated_time_stack_create(self, mock_ccu, mock_cr):
stack = parser.Stack(utils.dummy_context(), 'convg_updated_time_test', stack = parser.Stack(utils.dummy_context(), 'convg_updated_time_test',