diff --git a/ironic/conductor/base_manager.py b/ironic/conductor/base_manager.py index c5c7d4b903..cd63d875c4 100644 --- a/ironic/conductor/base_manager.py +++ b/ironic/conductor/base_manager.py @@ -297,6 +297,8 @@ class BaseConductorManager(object): return self._shutdown = True self._keepalive_evt.set() + # clear all locks held by this conductor before deregistering + self.dbapi.clear_node_reservations_for_conductor(self.host) if deregister: try: # Inform the cluster that this conductor is shutting down. diff --git a/ironic/tests/unit/conductor/test_base_manager.py b/ironic/tests/unit/conductor/test_base_manager.py index f8ba77c3fa..49cacbff5b 100644 --- a/ironic/tests/unit/conductor/test_base_manager.py +++ b/ironic/tests/unit/conductor/test_base_manager.py @@ -64,6 +64,17 @@ class StartStopTestCase(mgr_utils.ServiceSetUpMixin, db_base.DbTestCase): node.refresh() self.assertIsNone(node.reservation) + def test_stop_clears_conductor_locks(self): + node = obj_utils.create_test_node(self.context, + reservation=self.hostname) + node.save() + self._start_service() + res = objects.Conductor.get_by_hostname(self.context, self.hostname) + self.assertEqual(self.hostname, res['hostname']) + self.service.del_host() + node.refresh() + self.assertIsNone(node.reservation) + def test_stop_unregisters_conductor(self): self._start_service() res = objects.Conductor.get_by_hostname(self.context, self.hostname) diff --git a/releasenotes/notes/release-reservation-on-conductor-stop-6ebbcdf92da57ca6.yaml b/releasenotes/notes/release-reservation-on-conductor-stop-6ebbcdf92da57ca6.yaml new file mode 100644 index 0000000000..1d583a88cb --- /dev/null +++ b/releasenotes/notes/release-reservation-on-conductor-stop-6ebbcdf92da57ca6.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixes an issue where a node may be locked from changes if a conductor's + hostname case is changed before restarting the conductor service. clean + up the reservation once the conductor stopped.