25dadb94db
The CachingScheduler has been deprecated since Pike [1]. It does not use the placement service and as more of nova relies on placement for managing resource allocations, maintaining compabitility for the CachingScheduler is exorbitant. The release note in this change goes into much more detail about why the FilterScheduler + Placement should be a sufficient replacement for the original justification for the CachingScheduler along with details on how to migrate from the CachingScheduler to the FilterScheduler. Since the [scheduler]/driver configuration option does allow loading out-of-tree drivers and the scheduler driver interface does have the USES_ALLOCATION_CANDIDATES variable, it is possible that there are drivers being used which are also not using the placement service. The release note also explains this but warns against it. However, as a result some existing functional tests, which were using the CachingScheduler, are updated to still test scheduling without allocations being created in the placement service. Over time we will likely remove the USES_ALLOCATION_CANDIDATES variable in the scheduler driver interface along with the compatibility code associated with it, but that is left for a later change. [1] Ia7ff98ff28b7265058845e46b277317a2bfc96d2 Change-Id: I1832da2190be5ef2b04953938860a56a43e8cddf
62 lines
2.5 KiB
Python
62 lines
2.5 KiB
Python
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import mock
|
|
|
|
from nova.cmd import scheduler
|
|
from nova import config
|
|
from nova import test
|
|
|
|
|
|
# required because otherwise oslo early parse_args dies
|
|
@mock.patch.object(config, 'parse_args', new=lambda *args, **kwargs: None)
|
|
class TestScheduler(test.NoDBTestCase):
|
|
|
|
@mock.patch('nova.service.Service.create')
|
|
@mock.patch('nova.service.serve')
|
|
@mock.patch('nova.service.wait')
|
|
@mock.patch('oslo_concurrency.processutils.get_worker_count',
|
|
return_value=2)
|
|
def test_workers_defaults(self, get_worker_count, mock_wait, mock_serve,
|
|
service_create):
|
|
scheduler.main()
|
|
get_worker_count.assert_called_once_with()
|
|
mock_serve.assert_called_once_with(
|
|
service_create.return_value, workers=2)
|
|
mock_wait.assert_called_once_with()
|
|
|
|
@mock.patch('nova.service.Service.create')
|
|
@mock.patch('nova.service.serve')
|
|
@mock.patch('nova.service.wait')
|
|
@mock.patch('oslo_concurrency.processutils.get_worker_count')
|
|
def test_workers_override(self, get_worker_count, mock_wait, mock_serve,
|
|
service_create):
|
|
self.flags(workers=4, group='scheduler')
|
|
scheduler.main()
|
|
get_worker_count.assert_not_called()
|
|
mock_serve.assert_called_once_with(
|
|
service_create.return_value, workers=4)
|
|
mock_wait.assert_called_once_with()
|
|
|
|
@mock.patch('nova.service.Service.create')
|
|
@mock.patch('nova.service.serve')
|
|
@mock.patch('nova.service.wait')
|
|
@mock.patch('oslo_concurrency.processutils.get_worker_count')
|
|
def test_workers_fake_scheduler(self, get_worker_count, mock_wait,
|
|
mock_serve, service_create):
|
|
self.flags(driver='fake_scheduler', group='scheduler')
|
|
scheduler.main()
|
|
get_worker_count.assert_not_called()
|
|
mock_serve.assert_called_once_with(
|
|
service_create.return_value, workers=1)
|
|
mock_wait.assert_called_once_with()
|