diff options
| author | Vanou Ishii <ishii.vanou@fujitsu.com> | 2022-08-03 13:39:48 +0900 |
|---|---|---|
| committer | Jacob Anders <janders@redhat.com> | 2022-10-05 10:01:05 +1000 |
| commit | 6ae0aa11ddb57f50f3f5f52e09bd8794ff60f2d0 (patch) | |
| tree | d84f8b3db5e0a60feedc16d4afe0715534ca0b99 | |
| parent | 2ecfc2e999b6810e73ad54072337eeca937f53e0 (diff) | |
| download | ironic-6ae0aa11ddb57f50f3f5f52e09bd8794ff60f2d0.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
(cherry picked from commit f6d2b2ed930caaa1fa7a6827876845eb02610848)
| -rw-r--r-- | ironic/conductor/verify.py | 2 |
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, |