openstack
/
ironic
Code Issues Proposed changes

Merge "Prevents power sync with ADOPTFAIL nodes"

This commit is contained in:
Zuul 2020-08-12 22:50:46 +00:00 committed by Gerrit Code Review
parent 58c1af93e2 0134508266
commit e078d0bbc8
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ironic/conductor/manager.py
View File

@ -81,7 +81,8 @@ LOG = log.getLogger(__name__)
METRICS = metrics_utils.get_metrics_logger(__name__)
SYNC_EXCLUDED_STATES = (states.DEPLOYWAIT, states.CLEANWAIT, states.ENROLL)
SYNC_EXCLUDED_STATES = (states.DEPLOYWAIT, states.CLEANWAIT, states.ENROLL,
states.ADOPTFAIL)
class ConductorManager(base_manager.BaseConductorManager):

22
ironic/tests/unit/conductor/test_manager.py
View File

@ -5266,6 +5266,28 @@ class ManagerSyncPowerStatesTestCase(mgr_utils.CommonMixIn,
shared=True)
sync_mock.assert_called_once_with(task, mock.ANY)
def test_single_node_adopt_failed(self, get_nodeinfo_mock,
mapped_mock, acquire_mock, sync_mock):
get_nodeinfo_mock.return_value = self._get_nodeinfo_list_response()
mapped_mock.return_value = True
task = self._create_task(
node_attrs=dict(uuid=self.node.uuid,
provision_state=states.ADOPTFAIL))
acquire_mock.side_effect = self._get_acquire_side_effect(task)
self.service._sync_power_states(self.context)
get_nodeinfo_mock.assert_called_once_with(
columns=self.columns, filters=self.filters)
mapped_mock.assert_called_once_with(self.service,
self.node.uuid,
self.node.driver,
self.node.conductor_group)
acquire_mock.assert_called_once_with(self.context, self.node.uuid,
purpose=mock.ANY,
shared=True)
sync_mock.assert_not_called()
def test__sync_power_state_multiple_nodes(self, get_nodeinfo_mock,
mapped_mock, acquire_mock,
sync_mock):

5
releasenotes/notes/skip-power-sync-for-adoptfail-d2498f1a2e997ed7.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fixes the conductor so the power sync operations are not asserted for
nodes in the ``adopt failed`` state.