d33d05f475
This branch removes AbstractScheduler, BaseScheduler and LeastCostScheduler and replaces it with DistributedScheduler. Now the points of extension are handled via the --default_host_filters and --least_cost_functions only. Also, greatly simplified the zone handling logic in DistibutedScheduler, mostly by removing the cryptic dicts with helper classes. Fixed up the Least Cost functions to better deal with multiple functions. (In a followup patch I will removed the normalization that occurs as this will be a problem). Tests were mostly rewritten to support this new world order. Debated removing JSONFilter since it's not accessible from the outside world, but decided to keep it as there are discussions afoot on making scheduler changes without having to redeploy code or restart services. HostFilters once again get the all the host service capabilities, but now via a HostInfo class that mostly contains read-only dicts of capabilities. Virtual resource consumption is done in the DistributedScheduler class now. The filters/weighing functions don't need to worry about this. Also, weighing functions only have to return a single host and not worry about the number of instances requested. Change-Id: I92600a4a9c58b1add775c328a18d8f48c305861e
73 lines
2.6 KiB
Python
73 lines
2.6 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 Distributed Scheduler tests.
|
|
"""
|
|
|
|
from nova.scheduler import distributed_scheduler
|
|
from nova.scheduler import zone_manager
|
|
|
|
|
|
class FakeDistributedScheduler(distributed_scheduler.DistributedScheduler):
|
|
# No need to stub anything at the moment
|
|
pass
|
|
|
|
|
|
class FakeZoneManager(zone_manager.ZoneManager):
|
|
"""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):
|
|
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)),
|
|
]
|
|
|
|
def _compute_node_get_all(self, context):
|
|
return [
|
|
dict(local_gb=1024, memory_mb=1024, service=dict(host='host1')),
|
|
dict(local_gb=2048, memory_mb=2048, service=dict(host='host2')),
|
|
dict(local_gb=4096, memory_mb=4096, service=dict(host='host3')),
|
|
dict(local_gb=8192, memory_mb=8192, service=dict(host='host4')),
|
|
]
|
|
|
|
def _instance_get_all(self, context):
|
|
return [
|
|
dict(local_gb=512, memory_mb=512, host='host1'),
|
|
dict(local_gb=512, memory_mb=512, host='host1'),
|
|
dict(local_gb=512, memory_mb=512, host='host2'),
|
|
dict(local_gb=1024, memory_mb=1024, host='host3'),
|
|
]
|