8d1b4cee5b
bug 928521 modified nova/scheduler/manager.py to reset vm_state to ACTIVE and set task_state to None when prep_resize raises a NoHostsFound refactored run_instance and prep_resize so they don't go through _schedule and now must be implemented in driver Changed behavior to set vm_state to error on any other exception in prep_resize. Change behavior to change instance vm_state to ERROR on exceptions Added tests that the vm_state gets updated Added tests that schedule_prep_resize and schedule_run_instance have no implementation in the Driver base class Had to adjust methods and tests for Multi scheduler to reflect the new Scheduler contract Change-Id: Ibcac7ef0df3456793a2132beb7a711849510da80
82 lines
2.9 KiB
Python
82 lines
2.9 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
|
|
# Copyright (c) 2010 Openstack, LLC.
|
|
# Copyright 2010 United States Government as represented by the
|
|
# Administrator of the National Aeronautics and Space Administration.
|
|
# 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.
|
|
|
|
"""
|
|
Scheduler that allows routing some calls to one driver and others to another.
|
|
"""
|
|
|
|
from nova import flags
|
|
from nova.openstack.common import cfg
|
|
from nova import utils
|
|
from nova.scheduler import driver
|
|
|
|
|
|
multi_scheduler_opts = [
|
|
cfg.StrOpt('compute_scheduler_driver',
|
|
default='nova.scheduler.'
|
|
'filter_scheduler.FilterScheduler',
|
|
help='Driver to use for scheduling compute calls'),
|
|
cfg.StrOpt('volume_scheduler_driver',
|
|
default='nova.scheduler.chance.ChanceScheduler',
|
|
help='Driver to use for scheduling volume calls'),
|
|
]
|
|
|
|
FLAGS = flags.FLAGS
|
|
FLAGS.register_opts(multi_scheduler_opts)
|
|
|
|
# A mapping of methods to topics so we can figure out which driver to use.
|
|
# There are currently no compute methods proxied through the map
|
|
_METHOD_MAP = {'create_volume': 'volume',
|
|
'create_volumes': 'volume'}
|
|
|
|
|
|
class MultiScheduler(driver.Scheduler):
|
|
"""A scheduler that holds multiple sub-schedulers.
|
|
|
|
This exists to allow flag-driven composibility of schedulers, allowing
|
|
third parties to integrate custom schedulers more easily.
|
|
|
|
"""
|
|
|
|
def __init__(self):
|
|
super(MultiScheduler, self).__init__()
|
|
compute_driver = utils.import_object(FLAGS.compute_scheduler_driver)
|
|
volume_driver = utils.import_object(FLAGS.volume_scheduler_driver)
|
|
|
|
self.drivers = {'compute': compute_driver,
|
|
'volume': volume_driver}
|
|
|
|
def __getattr__(self, key):
|
|
if not key.startswith('schedule_'):
|
|
raise AttributeError(key)
|
|
method = key[len('schedule_'):]
|
|
if method not in _METHOD_MAP:
|
|
raise AttributeError(key)
|
|
return getattr(self.drivers[_METHOD_MAP[method]], key)
|
|
|
|
def schedule(self, context, topic, method, *_args, **_kwargs):
|
|
return self.drivers[topic].schedule(context, topic,
|
|
method, *_args, **_kwargs)
|
|
|
|
def schedule_run_instance(self, *args, **kwargs):
|
|
return self.drivers['compute'].schedule_run_instance(*args, **kwargs)
|
|
|
|
def schedule_prep_resize(self, *args, **kwargs):
|
|
return self.drivers['compute'].schedule_prep_resize(*args, **kwargs)
|