openstack/ironic
Code Issues Proposed changes

Merge "Keep original error message when cleaning tear down fails"

Browse Source
This commit is contained in:
Jenkins 2016-06-07 11:49:37 +00:00 committed by Gerrit Code Review
commit 3e2bb4fd2f
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ironic/conductor/manager.py
View File

@ -1003,8 +1003,9 @@ class ConductorManager(base_manager.BaseConductorManager):
try:
task.driver.deploy.tear_down_cleaning(task)
except Exception as e:
msg = (_('Failed to tear down from cleaning for node %s')
% node.uuid)
msg = (_('Failed to tear down from cleaning for node %(node)s, '
'reason: %(err)s')
% {'node': node.uuid, 'err': e})
LOG.exception(msg)
return utils.cleaning_error_handler(task, msg,
tear_down_cleaning=False)

5
ironic/tests/unit/conductor/test_manager.py
View File

@ -2058,7 +2058,7 @@ class DoNodeCleanTestCase(mgr_utils.ServiceSetUpMixin,
deploy_exec_mock.return_value = None
power_exec_mock.return_value = None
tear_mock.side_effect = Exception()
tear_mock.side_effect = Exception('boom')
self._start_service()
@ -2088,7 +2088,8 @@ class DoNodeCleanTestCase(mgr_utils.ServiceSetUpMixin,
]
self.assertEqual(power_exec_calls, power_exec_mock.call_args_list)
log_mock.exception.assert_called_once_with(
'Failed to tear down from cleaning for node {}'.format(node.uuid))
'Failed to tear down from cleaning for node {}, reason: boom'
.format(node.uuid))
def test__do_next_clean_step_automated_fail_in_tear_down_cleaning(self):
self._do_next_clean_step_fail_in_tear_down_cleaning()