summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVanou Ishii <ishii.vanou@fujitsu.com>2022-08-03 13:39:48 +0900
committerVanou Ishii <ishii.vanou@fujitsu.com>2022-08-03 14:41:13 +0900
commitf6d2b2ed930caaa1fa7a6827876845eb02610848 (patch)
treeb9d5b67eef41b2e50f1b6e4816a9787a7c591596
parent45c9c3029f5363b6e24e578648c09213a7338db1 (diff)
downloadironic-f6d2b2ed930caaa1fa7a6827876845eb02610848.tar.gz
Modify do_node_verify to avoid state machine stuck
do_node_verify function runs vendor-driver-defined verify_step. However, when vendor verify_step fails, it causes stuck of state machine at verifying. This is because do_node_verify function tries to retrieve name of verify_step through node.verify_step but node doesn't have verify_step attribute and there is no way to handle exception. This commit fixes this issue. Change-Id: Ie2ec6e08214661f7dc61c92de646e2f4d5bb5469 Story: 2010209 Task: 45942
-rw-r--r--ironic/conductor/verify.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ironic/conductor/verify.py b/ironic/conductor/verify.py
index 50180e2b8..812472b83 100644
--- a/ironic/conductor/verify.py
+++ b/ironic/conductor/verify.py
@@ -63,7 +63,7 @@ def do_node_verify(task):
except Exception as e:
error = ('Node %(node)s failed verify step %(step)s '
'with unexpected error: %(err)s' %
- {'node': node.uuid, 'step': node.verify_step,
+ {'node': node.uuid, 'step': step['step'],
'err': e})
utils.verifying_error_handler(
task, error,