From d8a0b0c270c387fdf76ca2a9739e17ba143ed512 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Thu, 11 Mar 2021 11:28:23 +0100 Subject: [PATCH] Don't try to use attempts=None with tenacity Change-Id: Ifb139f71e9cb57409f95512e0dc087d0198b4b86 --- ironic/conductor/task_manager.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ironic/conductor/task_manager.py b/ironic/conductor/task_manager.py index b6adde974e..10cd6cace8 100644 --- a/ironic/conductor/task_manager.py +++ b/ironic/conductor/task_manager.py @@ -326,17 +326,18 @@ class TaskManager(object): self._debug_timer.restart() if self._patient: - attempts = None + stop_after = tenacity.stop_never elif self._retry: - attempts = CONF.conductor.node_locked_retry_attempts + stop_after = tenacity.stop_after_attempt( + CONF.conductor.node_locked_retry_attempts) else: - attempts = 1 + stop_after = tenacity.stop_after_attempt(1) # NodeLocked exceptions can be annoying. Let's try to alleviate # some of that pain by retrying our lock attempts. @tenacity.retry( retry=tenacity.retry_if_exception_type(exception.NodeLocked), - stop=tenacity.stop_after_attempt(attempts), + stop=stop_after, wait=tenacity.wait_fixed( CONF.conductor.node_locked_retry_interval), reraise=True)