7ea4a01a9d
This patch makes rpc calls that are the result of booting an instance propagate the new block device mapping format. The way this is done is by adding a 'legacy_bdm' flag to the conductor (task) API. Since both the scheduler and the compute service propagate the block device mapping as part of the request_spec field, a flag named legacy_bdm_in_spec to indicate that was introduced in their respective APIs. Currently block_device_mapping is not used by any of the in-tree filters in the scheduler, so it is assumed that scheduler's boot functionality has now transitioned to the new format. This patch also bumps RPC versions of the task, scheduler and compute manager classes. Finally this patch propagates the legacy_bdm_in_spec through the run_instance callback of the compute manager so that, in case of error - the instance is re-scheduled with the proper flag set. blueprint: improve-block-device-handling Change-Id: I5f25ddd4d586dda91061f065c1796be726b0ede3
148 lines
6.0 KiB
Python
148 lines
6.0 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
|
|
# Copyright 2012, Red Hat, Inc.
|
|
#
|
|
# 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.
|
|
|
|
"""
|
|
Client side of the scheduler manager RPC API.
|
|
"""
|
|
|
|
from oslo.config import cfg
|
|
|
|
from nova.openstack.common import jsonutils
|
|
import nova.openstack.common.rpc.proxy
|
|
|
|
rpcapi_opts = [
|
|
cfg.StrOpt('scheduler_topic',
|
|
default='scheduler',
|
|
help='the topic scheduler nodes listen on'),
|
|
]
|
|
|
|
CONF = cfg.CONF
|
|
CONF.register_opts(rpcapi_opts)
|
|
|
|
rpcapi_cap_opt = cfg.StrOpt('scheduler',
|
|
help='Set a version cap for messages sent to scheduler services')
|
|
CONF.register_opt(rpcapi_cap_opt, 'upgrade_levels')
|
|
|
|
|
|
class SchedulerAPI(nova.openstack.common.rpc.proxy.RpcProxy):
|
|
'''Client side of the scheduler rpc API.
|
|
|
|
API version history:
|
|
|
|
1.0 - Initial version.
|
|
1.1 - Changes to prep_resize():
|
|
- remove instance_uuid, add instance
|
|
- remove instance_type_id, add instance_type
|
|
- remove topic, it was unused
|
|
1.2 - Remove topic from run_instance, it was unused
|
|
1.3 - Remove instance_id, add instance to live_migration
|
|
1.4 - Remove update_db from prep_resize
|
|
1.5 - Add reservations argument to prep_resize()
|
|
1.6 - Remove reservations argument to run_instance()
|
|
1.7 - Add create_volume() method, remove topic from live_migration()
|
|
|
|
2.0 - Remove 1.x backwards compat
|
|
2.1 - Add image_id to create_volume()
|
|
2.2 - Remove reservations argument to create_volume()
|
|
2.3 - Remove create_volume()
|
|
2.4 - Change update_service_capabilities()
|
|
- accepts a list of capabilities
|
|
2.5 - Add get_backdoor_port()
|
|
2.6 - Add select_hosts()
|
|
|
|
... Grizzly supports message version 2.6. So, any changes to existing
|
|
methods in 2.x after that point should be done such that they can
|
|
handle the version_cap being set to 2.6.
|
|
|
|
2.7 - Add select_destinations()
|
|
2.8 - Deprecate prep_resize()
|
|
2.9 - Added the leagacy_bdm_in_spec parameter to run_instances
|
|
'''
|
|
|
|
#
|
|
# NOTE(russellb): This is the default minimum version that the server
|
|
# (manager) side must implement unless otherwise specified using a version
|
|
# argument to self.call()/cast()/etc. here. It should be left as X.0 where
|
|
# X is the current major API version (1.0, 2.0, ...). For more information
|
|
# about rpc API versioning, see the docs in
|
|
# openstack/common/rpc/dispatcher.py.
|
|
#
|
|
BASE_RPC_API_VERSION = '2.0'
|
|
|
|
VERSION_ALIASES = {
|
|
'grizzly': '2.6',
|
|
}
|
|
|
|
def __init__(self):
|
|
version_cap = self.VERSION_ALIASES.get(CONF.upgrade_levels.scheduler,
|
|
CONF.upgrade_levels.scheduler)
|
|
super(SchedulerAPI, self).__init__(topic=CONF.scheduler_topic,
|
|
default_version=self.BASE_RPC_API_VERSION,
|
|
version_cap=version_cap)
|
|
|
|
def select_destinations(self, ctxt, request_spec, filter_properties):
|
|
return self.call(ctxt, self.make_msg('select_destinations',
|
|
request_spec=request_spec, filter_properties=filter_properties),
|
|
version='2.7')
|
|
|
|
def run_instance(self, ctxt, request_spec, admin_password,
|
|
injected_files, requested_networks, is_first_time,
|
|
filter_properties, legacy_bdm_in_spec=True):
|
|
return self.cast(ctxt, self.make_msg('run_instance',
|
|
request_spec=request_spec, admin_password=admin_password,
|
|
injected_files=injected_files,
|
|
requested_networks=requested_networks,
|
|
is_first_time=is_first_time,
|
|
filter_properties=filter_properties,
|
|
legacy_bdm_in_spec=legacy_bdm_in_spec), version='2.9')
|
|
|
|
# NOTE(timello): This method is deprecated and it's functionality has
|
|
# been moved to conductor. This should be removed in RPC_API_VERSION 3.0.
|
|
def prep_resize(self, ctxt, instance, instance_type, image,
|
|
request_spec, filter_properties, reservations):
|
|
instance_p = jsonutils.to_primitive(instance)
|
|
instance_type_p = jsonutils.to_primitive(instance_type)
|
|
reservations_p = jsonutils.to_primitive(reservations)
|
|
image_p = jsonutils.to_primitive(image)
|
|
self.cast(ctxt, self.make_msg('prep_resize',
|
|
instance=instance_p, instance_type=instance_type_p,
|
|
image=image_p, request_spec=request_spec,
|
|
filter_properties=filter_properties,
|
|
reservations=reservations_p))
|
|
|
|
def live_migration(self, ctxt, block_migration, disk_over_commit,
|
|
instance, dest):
|
|
# NOTE(comstud): Call vs cast so we can get exceptions back, otherwise
|
|
# this call in the scheduler driver doesn't return anything.
|
|
instance_p = jsonutils.to_primitive(instance)
|
|
return self.call(ctxt, self.make_msg('live_migration',
|
|
block_migration=block_migration,
|
|
disk_over_commit=disk_over_commit, instance=instance_p,
|
|
dest=dest))
|
|
|
|
def update_service_capabilities(self, ctxt, service_name, host,
|
|
capabilities):
|
|
self.fanout_cast(ctxt, self.make_msg('update_service_capabilities',
|
|
service_name=service_name, host=host,
|
|
capabilities=capabilities),
|
|
version='2.4')
|
|
|
|
def select_hosts(self, ctxt, request_spec, filter_properties):
|
|
return self.call(ctxt, self.make_msg('select_hosts',
|
|
request_spec=request_spec,
|
|
filter_properties=filter_properties),
|
|
version='2.6')
|