openstack/ironic
Code Issues Proposed changes

Don't try to use attempts=None with tenacity

Browse Source 
Change-Id: Ifb139f71e9cb57409f95512e0dc087d0198b4b86
This commit is contained in:
Dmitry Tantsur 2021-03-11 11:28:23 +01:00
parent a756b04ac0
commit d8a0b0c270
1 changed files with 5 additions and 4 deletions

9
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)