3322cc19cc
This is a bit of a scheduler refactoring to support future scaling work as a part of blueprint scaling-zones. Also fixes bug 891971 (remove unused set_network_host in scheduler) With or without that blueprint work, this cleans a number of things up and paves the way for combining a lot of the schedulers by using this new 'HostManager' for filtering and weighing (future work :) On to the goodies: Introduces new HostManager, splitting code out from ZoneManager. Zone communication and management is handlded in the ZoneManager. Host filtering and weighing is handled in the HostManager. ZoneManager is removed from the SchedulerManager and direct calls to it from the SchedulerManager now occur via the scheduler driver. This simplifies a number of things. ZoneManager and HostManager classes to use are now flags. This allows one to extend the current classes and use them. HostManager uses a HostState class to keep info about hosts. This class needs to be extendable. Since it's very much tied to the HostManager, the HostState class to use is not a flag. It is, instead, a class variable in HostManager. Filtering functions now accept a single host to filter. This improves performance by not having to build a new array of hosts within every filter function. Filtering functions now accept a more generic 'filter_properties' dictionary which we can fill with information available for filtering. Adding additional data to this 'filter_properties' can be done by subclassing. Weighing functions now accept this 'filter_properties', also, although it's poorly named ATM. Will be cleaned up in a future branch when I move some weighing functions into the host manager. Filtering tests are true unit tests now. test_zones was moved from top level to under scheduler as zone_manager tests and refactored to be true unit tests. Host tests are true unit tests now. Other minor cleanups Change-Id: I0ef2acef6639b4500c400c18cf2c673cb80f0150
99 lines
3.5 KiB
Python
99 lines
3.5 KiB
Python
# Copyright 2011 OpenStack LLC.
|
|
# All Rights Reserved.
|
|
#
|
|
# 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.
|
|
"""
|
|
Fakes For Scheduler tests.
|
|
"""
|
|
|
|
from nova import db
|
|
from nova.scheduler import distributed_scheduler
|
|
from nova.scheduler import host_manager
|
|
from nova.scheduler import zone_manager
|
|
|
|
|
|
COMPUTE_NODES = [
|
|
dict(id=1, local_gb=1024, memory_mb=1024, service=dict(host='host1')),
|
|
dict(id=2, local_gb=2048, memory_mb=2048, service=dict(host='host2')),
|
|
dict(id=3, local_gb=4096, memory_mb=4096, service=dict(host='host3')),
|
|
dict(id=4, local_gb=8192, memory_mb=8192, service=dict(host='host4')),
|
|
# Broken entry
|
|
dict(id=5, local_gb=1024, memory_mb=1024, service=None),
|
|
]
|
|
|
|
INSTANCES = [
|
|
dict(local_gb=512, memory_mb=512, host='host1'),
|
|
dict(local_gb=512, memory_mb=512, host='host2'),
|
|
dict(local_gb=512, memory_mb=512, host='host2'),
|
|
dict(local_gb=1024, memory_mb=1024, host='host3'),
|
|
# Broken host
|
|
dict(local_gb=1024, memory_mb=1024, host=None),
|
|
# No matching host
|
|
dict(local_gb=1024, memory_mb=1024, host='host5'),
|
|
]
|
|
|
|
|
|
class FakeDistributedScheduler(distributed_scheduler.DistributedScheduler):
|
|
def __init__(self, *args, **kwargs):
|
|
super(FakeDistributedScheduler, self).__init__(*args, **kwargs)
|
|
self.zone_manager = zone_manager.ZoneManager()
|
|
self.host_manager = host_manager.HostManager()
|
|
|
|
|
|
class FakeHostManager(host_manager.HostManager):
|
|
"""host1: free_ram_mb=1024-512-512=0, free_disk_gb=1024-512-512=0
|
|
host2: free_ram_mb=2048-512=1536 free_disk_gb=2048-512=1536
|
|
host3: free_ram_mb=4096-1024=3072 free_disk_gb=4096-1024=3072
|
|
host4: free_ram_mb=8192 free_disk_gb=8192"""
|
|
|
|
def __init__(self):
|
|
super(FakeHostManager, self).__init__()
|
|
|
|
self.service_states = {
|
|
'host1': {
|
|
'compute': {'host_memory_free': 1073741824},
|
|
},
|
|
'host2': {
|
|
'compute': {'host_memory_free': 2147483648},
|
|
},
|
|
'host3': {
|
|
'compute': {'host_memory_free': 3221225472},
|
|
},
|
|
'host4': {
|
|
'compute': {'host_memory_free': 999999999},
|
|
},
|
|
}
|
|
|
|
def get_host_list_from_db(self, context):
|
|
return [
|
|
('host1', dict(free_disk_gb=1024, free_ram_mb=1024)),
|
|
('host2', dict(free_disk_gb=2048, free_ram_mb=2048)),
|
|
('host3', dict(free_disk_gb=4096, free_ram_mb=4096)),
|
|
('host4', dict(free_disk_gb=8192, free_ram_mb=8192)),
|
|
]
|
|
|
|
|
|
class FakeHostState(host_manager.HostState):
|
|
def __init__(self, host, topic, attribute_dict):
|
|
super(FakeHostState, self).__init__(host, topic)
|
|
for (key, val) in attribute_dict.iteritems():
|
|
setattr(self, key, val)
|
|
|
|
|
|
def mox_host_manager_db_calls(mox, context):
|
|
mox.StubOutWithMock(db, 'compute_node_get_all')
|
|
mox.StubOutWithMock(db, 'instance_get_all')
|
|
|
|
db.compute_node_get_all(context).AndReturn(COMPUTE_NODES)
|
|
db.instance_get_all(context).AndReturn(INSTANCES)
|