openstack
/
heat
Code Issues Proposed changes
Browse Source

Merge "Calculate the requires list in check_resource"

changes/75/568775/1
Zuul 4 years ago committed by Gerrit Code Review
parent
02c9905960 8edccc98b1
commit
99eb84d3a3
4 changed files with 46 additions and 66 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      heat/engine/check_resource.py
  2. 11
      heat/engine/resource.py
  3. 26
      heat/tests/engine/test_check_resource.py
  4. 65
      heat/tests/test_resource.py

10
heat/engine/check_resource.py
Unescape View File

@ -162,8 +162,10 @@ class CheckResource(object):
prev_template_id = rsrc.current_template_id
try:
if is_update:
requires = set(d.primary_key for d in resource_data.values()
if d is not None)
try:
check_resource_update(rsrc, tmpl.id, resource_data,
check_resource_update(rsrc, tmpl.id, requires,
self.engine_id,
stack, self.msg_queue)
except resource.UpdateReplace:
@ -406,15 +408,15 @@ def _check_for_message(msg_queue):
LOG.error('Unknown message "%s" received', message)
def check_resource_update(rsrc, template_id, resource_data, engine_id,
def check_resource_update(rsrc, template_id, requires, engine_id,
stack, msg_queue):
"""Create or update the Resource if appropriate."""
check_message = functools.partial(_check_for_message, msg_queue)
if rsrc.action == resource.Resource.INIT:
rsrc.create_convergence(template_id, resource_data, engine_id,
rsrc.create_convergence(template_id, requires, engine_id,
stack.time_remaining(), check_message)
else:
rsrc.update_convergence(template_id, resource_data, engine_id,
rsrc.update_convergence(template_id, requires, engine_id,
stack.time_remaining(), stack,
check_message)

11
heat/engine/resource.py
Unescape View File

@ -1154,14 +1154,11 @@ class Resource(status.ResourceStatus):
"""
return self
def create_convergence(self, template_id, resource_data, engine_id,
def create_convergence(self, template_id, requires, engine_id,
timeout, progress_callback=None):
"""Creates the resource by invoking the scheduler TaskRunner."""
self._calling_engine_id = engine_id
self.requires = list(
set(data.primary_key for data in resource_data.values()
if data is not None)
)
self.requires = list(requires)
self.current_template_id = template_id
if self.stack.adopt_stack_data is None:
runner = scheduler.TaskRunner(self.create)
@ -1412,7 +1409,7 @@ class Resource(status.ResourceStatus):
else:
raise UpdateReplace(self.name)
def update_convergence(self, template_id, resource_data, engine_id,
def update_convergence(self, template_id, new_requires, engine_id,
timeout, new_stack, progress_callback=None):
"""Update the resource synchronously.
@ -1422,8 +1419,6 @@ class Resource(status.ResourceStatus):
resource by invoking the scheduler TaskRunner.
"""
self._calling_engine_id = engine_id
new_requires = set(data.primary_key for data in resource_data.values()
if data is not None)
# Check that the resource type matches. If the type has changed by a
# legitimate substitution, the load()ed resource will already be of

26
heat/tests/engine/test_check_resource.py
Unescape View File

@ -91,7 +91,7 @@ class CheckWorkflowUpdateTest(common.HeatTestCase):
self.is_update, None)
mock_cru.assert_called_once_with(self.resource,
self.resource.stack.t.id,
{}, self.worker.engine_id,
set(), self.worker.engine_id,
mock.ANY, mock.ANY)
self.assertFalse(mock_crc.called)
@ -122,7 +122,7 @@ class CheckWorkflowUpdateTest(common.HeatTestCase):
self.is_update, None)
mock_cru.assert_called_once_with(self.resource,
self.resource.stack.t.id,
{}, self.worker.engine_id,
set(), self.worker.engine_id,
mock.ANY, mock.ANY)
self.assertTrue(mock_mr.called)
self.assertFalse(mock_crc.called)
@ -144,7 +144,7 @@ class CheckWorkflowUpdateTest(common.HeatTestCase):
self.is_update, None)
mock_cru.assert_called_once_with(self.resource,
self.resource.stack.t.id,
{}, self.worker.engine_id,
set(), self.worker.engine_id,
mock.ANY, mock.ANY)
self.assertFalse(mock_crc.called)
self.assertFalse(mock_pcr.called)
@ -545,6 +545,20 @@ class CheckWorkflowUpdateTest(common.HeatTestCase):
self.assertFalse(mock_pcr.called)
self.assertFalse(mock_csc.called)
@mock.patch.object(resource.Resource, 'load')
def test_requires(self, mock_load, mock_cru, mock_crc, mock_pcr, mock_csc):
mock_load.return_value = self.resource, self.stack, self.stack
res_data = {(1, True): {u'id': 5, u'name': 'A', 'attrs': {}},
(2, True): {u'id': 3, u'name': 'B', 'attrs': {}}}
self.worker.check_resource(self.ctx, self.resource.id,
self.stack.current_traversal,
sync_point.serialize_input_data(res_data),
self.is_update, {})
mock_cru.assert_called_once_with(
self.resource, self.resource.stack.t.id,
{5, 3}, self.worker.engine_id,
self.stack, mock.ANY)
@mock.patch.object(check_resource, 'check_stack_complete')
@mock.patch.object(check_resource, 'propagate_check_resource')
@ -699,7 +713,7 @@ class MiscMethodsTest(common.HeatTestCase):
def test_check_resource_update_init_action(self, mock_update, mock_create):
self.resource.action = 'INIT'
check_resource.check_resource_update(
self.resource, self.resource.stack.t.id, {}, 'engine-id',
self.resource, self.resource.stack.t.id, set(), 'engine-id',
self.stack, None)
self.assertTrue(mock_create.called)
self.assertFalse(mock_update.called)
@ -710,7 +724,7 @@ class MiscMethodsTest(common.HeatTestCase):
self, mock_update, mock_create):
self.resource.action = 'CREATE'
check_resource.check_resource_update(
self.resource, self.resource.stack.t.id, {}, 'engine-id',
self.resource, self.resource.stack.t.id, set(), 'engine-id',
self.stack, None)
self.assertFalse(mock_create.called)
self.assertTrue(mock_update.called)
@ -721,7 +735,7 @@ class MiscMethodsTest(common.HeatTestCase):
self, mock_update, mock_create):
self.resource.action = 'UPDATE'
check_resource.check_resource_update(
self.resource, self.resource.stack.t.id, {}, 'engine-id',
self.resource, self.resource.stack.t.id, set(), 'engine-id',
self.stack, None)
self.assertFalse(mock_create.called)
self.assertTrue(mock_update.called)

65
heat/tests/test_resource.py
Unescape View File

@ -2046,13 +2046,10 @@ class ResourceTest(common.HeatTestCase):
res.action = res.CREATE
res.store()
self._assert_resource_lock(res.id, None, None)
res_data = {(1, True): {u'id': 1, u'name': 'A', 'attrs': {}},
(2, True): {u'id': 3, u'name': 'B', 'attrs': {}}}
res_data = node_data.load_resources_data(res_data)
pcb = mock.Mock()
with mock.patch.object(resource.Resource, 'create') as mock_create:
res.create_convergence(self.stack.t.id, res_data, 'engine-007',
res.create_convergence(self.stack.t.id, {1, 3}, 'engine-007',
-1, pcb)
self.assertTrue(mock_create.called)
@ -2064,13 +2061,10 @@ class ResourceTest(common.HeatTestCase):
res = generic_rsrc.GenericResource('test_res', tmpl, self.stack)
res.action = res.CREATE
res.store()
res_data = {(1, True): {u'id': 1, u'name': 'A', 'attrs': {}},
(2, True): {u'id': 3, u'name': 'B', 'attrs': {}}}
res_data = node_data.load_resources_data(res_data)
pcb = mock.Mock()
self.assertRaises(scheduler.Timeout, res.create_convergence,
self.stack.t.id, res_data, 'engine-007', -1, pcb)
self.stack.t.id, {1, 3}, 'engine-007', -1, pcb)
def test_create_convergence_sets_requires_for_failure(self):
"""Ensure that requires are computed correctly.
@ -2084,11 +2078,8 @@ class ResourceTest(common.HeatTestCase):
dummy_ex = exception.ResourceNotAvailable(resource_name=res.name)
res.create = mock.Mock(side_effect=dummy_ex)
self._assert_resource_lock(res.id, None, None)
res_data = {(1, True): {u'id': 5, u'name': 'A', 'attrs': {}},
(2, True): {u'id': 3, u'name': 'B', 'attrs': {}}}
res_data = node_data.load_resources_data(res_data)
self.assertRaises(exception.ResourceNotAvailable,
res.create_convergence, self.stack.t.id, res_data,
res.create_convergence, self.stack.t.id, {5, 3},
'engine-007', self.dummy_timeout, self.dummy_event)
self.assertItemsEqual([5, 3], res.requires)
# The locking happens in create which we mocked out
@ -2103,11 +2094,8 @@ class ResourceTest(common.HeatTestCase):
self.stack.adopt_stack_data = {'resources': {'test_res': {
'resource_id': 'fluffy'}}}
self._assert_resource_lock(res.id, None, None)
res_data = {(1, True): {u'id': 5, u'name': 'A', 'attrs': {}},
(2, True): {u'id': 3, u'name': 'B', 'attrs': {}}}
res_data = node_data.load_resources_data(res_data)
tr = scheduler.TaskRunner(res.create_convergence, self.stack.t.id,
res_data, 'engine-007', self.dummy_timeout,
{5, 3}, 'engine-007', self.dummy_timeout,
self.dummy_event)
tr()
mock_adopt.assert_called_once_with(
@ -2122,11 +2110,8 @@ class ResourceTest(common.HeatTestCase):
res.store()
self.stack.adopt_stack_data = {'resources': {}}
self._assert_resource_lock(res.id, None, None)
res_data = {(1, True): {u'id': 5, u'name': 'A', 'attrs': {}},
(2, True): {u'id': 3, u'name': 'B', 'attrs': {}}}
res_data = node_data.load_resources_data(res_data)
tr = scheduler.TaskRunner(res.create_convergence, self.stack.t.id,
res_data, 'engine-007', self.dummy_timeout,
{5, 3}, 'engine-007', self.dummy_timeout,
self.dummy_event)
exc = self.assertRaises(exception.ResourceFailure, tr)
self.assertIn('Resource ID was not provided', six.text_type(exc))
@ -2160,11 +2145,8 @@ class ResourceTest(common.HeatTestCase):
new_temp, stack_id=self.stack.id)
res.stack.convergence = True
res_data = {(1, True): {u'id': 4, u'name': 'A', 'attrs': {}},
(2, True): {u'id': 3, u'name': 'B', 'attrs': {}}}
res_data = node_data.load_resources_data(res_data)
tr = scheduler.TaskRunner(res.update_convergence, new_temp.id,
res_data, 'engine-007', 120, new_stack)
{4, 3}, 'engine-007', 120, new_stack)
tr()
self.assertItemsEqual([3, 4], res.requires)
@ -2195,9 +2177,8 @@ class ResourceTest(common.HeatTestCase):
new_stack = parser.Stack(utils.dummy_context(), 'test_stack',
new_temp, stack_id=self.stack.id)
res_data = {}
tr = scheduler.TaskRunner(res.update_convergence, new_temp.id,
res_data, 'engine-007', -1, new_stack,
set(), 'engine-007', -1, new_stack,
self.dummy_event)
self.assertRaises(scheduler.Timeout, tr)
@ -2217,9 +2198,8 @@ class ResourceTest(common.HeatTestCase):
new_stack = parser.Stack(utils.dummy_context(), 'test_stack',
new_temp, stack_id=self.stack.id)
res_data = {}
self.assertRaises(resource.UpdateReplace, res.update_convergence,
new_temp.id, res_data, 'engine-007',
new_temp.id, set(), 'engine-007',
-1, new_stack)
def test_update_convergence_checks_resource_class(self):
@ -2239,9 +2219,8 @@ class ResourceTest(common.HeatTestCase):
new_stack = parser.Stack(ctx, 'test_stack',
new_temp, stack_id=self.stack.id)
res_data = {}
tr = scheduler.TaskRunner(res.update_convergence, new_temp.id,
res_data, 'engine-007', -1, new_stack,
set(), 'engine-007', -1, new_stack,
self.dummy_event)
self.assertRaises(resource.UpdateReplace, tr)
@ -2258,9 +2237,6 @@ class ResourceTest(common.HeatTestCase):
res.stack.convergence = True
res_data = {(1, True): {u'id': 4, u'name': 'A', 'attrs': {}},
(2, True): {u'id': 3, u'name': 'B', 'attrs': {}}}
res_data = node_data.load_resources_data(res_data)
tmpl = template.Template({
'HeatTemplateFormatVersion': '2012-12-12',
'Resources': {
@ -2269,7 +2245,7 @@ class ResourceTest(common.HeatTestCase):
new_stack = parser.Stack(utils.dummy_context(), 'test_stack',
tmpl, stack_id=self.stack.id)
tr = scheduler.TaskRunner(res.update_convergence, 'template_key',
res_data, 'engine-007', self.dummy_timeout,
{4, 3}, 'engine-007', self.dummy_timeout,
new_stack)
ex = self.assertRaises(exception.UpdateInProgress, tr)
msg = ("The resource %s is already being updated." %
@ -2306,9 +2282,6 @@ class ResourceTest(common.HeatTestCase):
}}, env=self.env)
new_temp.store(stack.context)
res_data = {(1, True): {u'id': 4, u'name': 'A', 'attrs': {}},
(2, True): {u'id': 3, u'name': 'B', 'attrs': {}}}
res_data = node_data.load_resources_data(res_data)
new_stack = parser.Stack(utils.dummy_context(), 'test_stack',
new_temp, stack_id=self.stack.id)
@ -2316,7 +2289,7 @@ class ResourceTest(common.HeatTestCase):
res._calling_engine_id = 'engine-9'
tr = scheduler.TaskRunner(res.update_convergence, new_temp.id,
res_data, 'engine-007', 120, new_stack,
{4, 3}, 'engine-007', 120, new_stack,
self.dummy_event)
self.assertRaises(exception.ResourceFailure, tr)
@ -2352,13 +2325,10 @@ class ResourceTest(common.HeatTestCase):
res.stack.convergence = True
res_data = {(1, True): {u'id': 4, u'name': 'A', 'attrs': {}},
(2, True): {u'id': 3, u'name': 'B', 'attrs': {}}}
res_data = node_data.load_resources_data(res_data)
new_stack = parser.Stack(utils.dummy_context(), 'test_stack',
new_temp, stack_id=self.stack.id)
tr = scheduler.TaskRunner(res.update_convergence, new_temp.id,
res_data, 'engine-007', 120, new_stack,
{4, 3}, 'engine-007', 120, new_stack,
self.dummy_event)
self.assertRaises(resource.UpdateReplace, tr)
@ -2386,7 +2356,7 @@ class ResourceTest(common.HeatTestCase):
self.stack.state_set(self.stack.ROLLBACK, self.stack.IN_PROGRESS,
'Simulate rollback')
res.restore_prev_rsrc = mock.Mock()
tr = scheduler.TaskRunner(res.update_convergence, 'new_tmpl_id', {},
tr = scheduler.TaskRunner(res.update_convergence, 'new_tmpl_id', set(),
'engine-007', self.dummy_timeout,
new_stack, self.dummy_event)
self.assertRaises(resource.UpdateReplace, tr)
@ -2410,7 +2380,7 @@ class ResourceTest(common.HeatTestCase):
self.stack.state_set(self.stack.ROLLBACK, self.stack.IN_PROGRESS,
'Simulate rollback')
res.restore_prev_rsrc = mock.Mock(side_effect=Exception)
tr = scheduler.TaskRunner(res.update_convergence, 'new_tmpl_id', {},
tr = scheduler.TaskRunner(res.update_convergence, 'new_tmpl_id', set(),
'engine-007', self.dummy_timeout, new_stack,
self.dummy_event)
self.assertRaises(exception.ResourceFailure, tr)
@ -4273,11 +4243,10 @@ class ResourceUpdateRestrictionTest(common.HeatTestCase):
self.stack = parser.Stack(utils.dummy_context(), 'test_stack',
template.Template(self.tmpl, env=self.env),
stack_id=str(uuid.uuid4()))
res_data = {}
res = self.stack['bar']
pcb = mock.Mock()
self.patchobject(res, 'lock')
res.create_convergence(self.stack.t.id, res_data, 'engine-007',
res.create_convergence(self.stack.t.id, set(), 'engine-007',
self.dummy_timeout, pcb)
return res
@ -4399,7 +4368,7 @@ class ResourceUpdateRestrictionTest(common.HeatTestCase):
error = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(res.update_convergence,
self.stack.t.id,
{},
set(),
'engine-007',
self.dummy_timeout,
self.new_stack,
@ -4431,7 +4400,7 @@ class ResourceUpdateRestrictionTest(common.HeatTestCase):
error = self.assertRaises(resource.UpdateReplace,
scheduler.TaskRunner(res.update_convergence,
self.stack.t.id,
{},
set(),
'engine-007',
self.dummy_timeout,
self.new_stack,

Write Preview
Loading…
Cancel
Save