openstack/ironic
Code Issues Proposed changes

Remove unneeded exception handling from conductor

Browse Source 
If previous "delete" event executed without errors node will be
in DELETING state under exclusive lock, and we have valid FSM
transition from DELETING to CLEANING.

Change-Id: Icdab1f55c36085b65fb1c638ad837c3407ec5fc1
This commit is contained in:
Yuriy Zveryanskyy 2016-10-04 11:28:42 +03:00
parent e6e7d4a523
commit b8212714e7
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ironic/conductor/manager.py
View File

@ -572,12 +572,7 @@ class ConductorManager(base_manager.BaseConductorManager):
node.save()
# Begin cleaning
try:
task.process_event('clean')
except exception.InvalidState:
raise exception.InvalidStateRequested(
action='clean', node=node.uuid,
state=node.provision_state)
task.process_event('clean')
self._do_node_clean(task)
def _get_node_next_clean_steps(self, task, skip_current_step=True):