openstack
/
senlin
Code Issues Proposed changes

Fix node delete with lifecycle hook bug 

Create copy of child node list and remove nodes from the original child
list if a node does not need to enter waiting lifecycle completion
because it is not found or not in ACTIVE state.

Change-Id: I04d57f4deb2f9f46aba1d9d4a566cb90dbe74d96
Closes-Bug: #1816677
This commit is contained in:
Duc Truong 2019-02-19 22:38:51 +00:00
parent 929b9697ad
commit 3e70333a65
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
senlin/engine/actions/cluster_action.py
View File

@ -368,7 +368,8 @@ class ClusterAction(base.Action):
notifier = msg.Message(lifecycle_hook_target, **kwargs)
for action_id, node_id in child:
child_copy = list(child)
for action_id, node_id in child_copy:
# wait lifecycle complete if node exists and is active
node = no.Node.get(self.context, node_id)
owner = None

16
senlin/tests/unit/engine/actions/test_delete.py
View File

@ -960,9 +960,9 @@ class ClusterDeleteTest(base.SenlinTestCase):
mock_action.side_effect = ['NODE_ACTION_1', 'NODE_ACTION_2']
mock_wait.return_value = (action.RES_OK, 'All dependents completed')
node1 = mock.Mock(status=consts.NS_ACTIVE, id='NODE_1',
physical_id="nova-server-1")
node2 = mock.Mock(status=consts.NS_ACTIVE, id='NODE_2',
physical_id=None)
node2 = mock.Mock(status=consts.NS_ACTIVE, id='NODE_2',
physical_id="nova-server-1")
mock_node_get.side_effect = [node1, node2]
# do it
res_code, res_msg = action._remove_nodes_with_hook(
@ -972,11 +972,11 @@ class ClusterDeleteTest(base.SenlinTestCase):
self.assertEqual(action.RES_OK, res_code)
self.assertEqual('All dependents completed', res_msg)
update_calls = [
mock.call(action.context, 'NODE_ACTION_1',
mock.call(action.context, 'NODE_ACTION_1', {'status': 'READY',
'owner': None}),
mock.call(action.context, 'NODE_ACTION_2',
{'status': 'WAITING_LIFECYCLE_COMPLETION',
'owner': 'OWNER_ID'}),
mock.call(action.context, 'NODE_ACTION_2', {'status': 'READY',
'owner': None})
'owner': 'OWNER_ID'})
]
mock_update.assert_has_calls(update_calls)
create_actions = [
@ -989,8 +989,8 @@ class ClusterDeleteTest(base.SenlinTestCase):
]
mock_action.assert_has_calls(create_actions)
mock_post.assert_called_once_with('NODE_ACTION_1', 'NODE_1',
node1.physical_id,
mock_post.assert_called_once_with('NODE_ACTION_2', 'NODE_2',
node2.physical_id,
consts.LIFECYCLE_NODE_TERMINATION)
mock_start.assert_called_once_with()
mock_wait.assert_called_once_with(action.data['hooks']['timeout'])