openstack/ironic
Code Issues Proposed changes

Merge "Ensure all errors are passed during cleaning"

Browse Source
This commit is contained in:
Zuul 2024-02-21 07:04:14 +00:00 committed by Gerrit Code Review
commit 0cfe290d15
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ironic/conductor/utils.py
View File

@ -480,7 +480,10 @@ def cleaning_error_handler(task, logmsg, errmsg=None, traceback=False,
msg2 = ('Failed to tear down cleaning on node %(uuid)s, ' msg2 = ('Failed to tear down cleaning on node %(uuid)s, '
'reason: %(err)s' % {'err': e, 'uuid': node.uuid}) 'reason: %(err)s' % {'err': e, 'uuid': node.uuid})
LOG.exception(msg2) LOG.exception(msg2)
errmsg = _('%s. Also failed to tear down cleaning.') % errmsg errmsg = _(
'%(orig_err)s. '
'Also %(msg2)s'
) % {'orig_err': errmsg, 'msg2': msg2}
if node.provision_state in ( if node.provision_state in (
states.CLEANING, states.CLEANING,