openstack
/
ironic
Code Issues Proposed changes

Merge "Remove unnecessary checks in periodic task methods"

This commit is contained in:
Zuul 2018-10-06 16:58:54 +00:00 committed by Gerrit Code Review
parent 108801007c a00ebf4ec7
commit 65fd114267
2 changed files with 0 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ironic/conductor/manager.py
View File

@ -1759,8 +1759,6 @@ class ConductorManager(base_manager.BaseConductorManager):
# FIXME(rloo): If the value is < 0, it will be enabled. That doesn't
# seem right.
callback_timeout = CONF.conductor.deploy_callback_timeout
if not callback_timeout:
return
filters = {'reserved': False,
'provision_state': states.DEPLOYWAIT,
@ -1977,8 +1975,6 @@ class ConductorManager(base_manager.BaseConductorManager):
# FIXME(rloo): If the value is < 0, it will be enabled. That doesn't
# seem right.
callback_timeout = CONF.conductor.clean_callback_timeout
if not callback_timeout:
return
filters = {'reserved': False,
'provision_state': states.CLEANWAIT,
@ -2767,10 +2763,6 @@ class ConductorManager(base_manager.BaseConductorManager):
def _send_sensor_data(self, context):
"""Periodically sends sensor data to Ceilometer."""
# do nothing if send_sensor_data option is False
if not CONF.conductor.send_sensor_data:
return
filters = {'associated': True}
nodes = queue.Queue()
for node_info in self.iter_nodes(fields=['instance_uuid'],
@ -2989,8 +2981,6 @@ class ConductorManager(base_manager.BaseConductorManager):
# FIXME(rloo): If the value is < 0, it will be enabled. That doesn't
# seem right.
callback_timeout = CONF.conductor.inspect_wait_timeout
if not callback_timeout:
return
filters = {'reserved': False,
'provision_state': states.INSPECTWAIT,

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

@ -5236,19 +5236,6 @@ class SensorsTestCase(mgr_utils.ServiceSetUpMixin, db_base.DbTestCase):
self.assertEqual(number_of_workers,
mock_spawn.call_count)
@mock.patch.object(manager.ConductorManager, '_mapped_to_this_conductor')
@mock.patch.object(dbapi.IMPL, 'get_nodeinfo_list')
def test___send_sensor_data_disabled(self, get_nodeinfo_list_mock,
_mapped_to_this_conductor_mock):
self._start_service()
get_nodeinfo_list_mock.reset_mock()
with mock.patch.object(manager.ConductorManager,
'_spawn_worker') as _spawn_mock:
self.service._send_sensor_data(self.context)
self.assertFalse(get_nodeinfo_list_mock.called)
self.assertFalse(_mapped_to_this_conductor_mock.called)
self.assertFalse(_spawn_mock.called)
@mgr_utils.mock_record_keepalive
class BootDeviceTestCase(mgr_utils.ServiceSetUpMixin, db_base.DbTestCase):
@ -6474,16 +6461,6 @@ class ManagerCheckDeployTimeoutsTestCase(mgr_utils.CommonMixIn,
columns=self.columns, filters=self.filters,
sort_key='provision_updated_at', sort_dir='asc')
def test_disabled(self, get_nodeinfo_mock, mapped_mock,
acquire_mock):
self.config(deploy_callback_timeout=0, group='conductor')
self.service._check_deploy_timeouts(self.context)
self.assertFalse(get_nodeinfo_mock.called)
self.assertFalse(mapped_mock.called)
self.assertFalse(acquire_mock.called)
def test_not_mapped(self, get_nodeinfo_mock, mapped_mock, acquire_mock):
get_nodeinfo_mock.return_value = self._get_nodeinfo_list_response()
mapped_mock.return_value = False
@ -7198,16 +7175,6 @@ class ManagerCheckInspectWaitTimeoutsTestCase(mgr_utils.CommonMixIn,
sort_dir='asc', columns=self.columns, filters=self.filters,
sort_key='inspection_started_at')
def test__check_inspect_timeouts_disabled(self, get_nodeinfo_mock,
mapped_mock, acquire_mock):
self.config(inspect_wait_timeout=0, group='conductor')
self.service._check_inspect_wait_timeouts(self.context)
self.assertFalse(get_nodeinfo_mock.called)
self.assertFalse(mapped_mock.called)
self.assertFalse(acquire_mock.called)
def test__check_inspect_timeouts_not_mapped(self, get_nodeinfo_mock,
mapped_mock, acquire_mock):
get_nodeinfo_mock.return_value = self._get_nodeinfo_list_response()