openstack/ironic
Code Issues Proposed changes

Add states.SERVICING and SERVICEWAIT to _FASTTRACK_HEARTBEAT_ALLOWED

Browse Source 
Currently, service steps may fail to start in scenarios dependent on IPA
fasttrack. This change attempts to resolve this by incorporating
servicing states in the fast track allowed states whitelist while also
making _FASTTRACK_HEARTBEAT_ALLOWED a superset of _HEARTBEAT_ALLOWED
instead of duplicating values in the two constants.

Change-Id: I47984469c1432e7fc7b4f1494b9f6c551c34672f
(cherry picked from commit 619e1ac80c)
This commit is contained in:
Jacob Anders 2024-04-10 11:16:57 +10:00 committed by Dmitry Tantsur
parent 438fd6220a
commit 22666a889f
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ironic/drivers/modules/agent_base.py
View File

@ -98,11 +98,9 @@ _HEARTBEAT_ALLOWED = (states.DEPLOYWAIT, states.CLEANWAIT, states.RESCUEWAIT,
states.SERVICEWAIT, states.SERVICEHOLD) states.SERVICEWAIT, states.SERVICEHOLD)
HEARTBEAT_ALLOWED = frozenset(_HEARTBEAT_ALLOWED) HEARTBEAT_ALLOWED = frozenset(_HEARTBEAT_ALLOWED)
_FASTTRACK_HEARTBEAT_ALLOWED = (states.DEPLOYWAIT, states.CLEANWAIT, _FASTTRACK_HEARTBEAT_ALLOWED = _HEARTBEAT_ALLOWED + (states.MANAGEABLE,
states.RESCUEWAIT, states.ENROLL, states.AVAILABLE,
states.MANAGEABLE, states.AVAILABLE, states.ENROLL)
states.DEPLOYING, states.CLEANHOLD,
states.DEPLOYHOLD, states.SERVICEHOLD)
FASTTRACK_HEARTBEAT_ALLOWED = frozenset(_FASTTRACK_HEARTBEAT_ALLOWED) FASTTRACK_HEARTBEAT_ALLOWED = frozenset(_FASTTRACK_HEARTBEAT_ALLOWED)

6
releasenotes/notes/add-servicing-to-heartbeat-fasttrack-85863df34ece6401.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fixes the issue of service steps not starting due to servicing states
(states.SERVICING and states.SERVICEWAIT) missing from
_FASTTRACK_HEARTBEAT_ALLOWED constant.