diff options
author | Russell Bryant <rbryant@redhat.com> | 2013-06-10 21:18:37 -0400 |
---|---|---|
committer | Russell Bryant <rbryant@redhat.com> | 2013-06-14 11:38:22 -0400 |
commit | 2bcdb2057188a1a1bd1731ff713631e8a30e4f20 (patch) | |
tree | 774f85092371effcef463ff92fd17b3f1bf5a411 /nova/scheduler/rpcapi.py | |
parent | 77595f8e08a61507ad5c7c990651fd4f8131c150 (diff) | |
download | nova-2bcdb2057188a1a1bd1731ff713631e8a30e4f20.tar.gz nova-2bcdb2057188a1a1bd1731ff713631e8a30e4f20.tar.xz nova-2bcdb2057188a1a1bd1731ff713631e8a30e4f20.zip |
Add rpc client side version control.
This is a first pass at client side version control for rpc. It allows
you to configure a max version of messages that clients are allowed to
send. You can find one example of how clients need to adapt in the
conductor rpcapi. All other changes in rpc apis since the grizzly
release are not applicable to this.
Some future improvements to this could be reporting the versions
supported by running services and having that be discoverable via the
API. We could also consider allow setting these client side version
caps via the API. For now, recommended values for these config
options while attempting a rolling upgrade will just have to be documented.
The config options allow specifying specific rpc api version numbers if
desired, but an alias of 'grizzly' is also supported. So typically at
the start of a rolling upgrade you'd have:
[upgrade_levels]
compute=grizzly
conductor=grizzly
scheduler=grizzly
... etc ...
And as you update all instances of a service, you would remove that bit
from your configuration across the deployment using your config management
system of choice.
DocImpact
Implements blueprint rpc-version-control.
Change-Id: I2c0fd6dd7484c87823846d7c31d6525d93cd1b43
Diffstat (limited to 'nova/scheduler/rpcapi.py')
-rw-r--r-- | nova/scheduler/rpcapi.py | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/nova/scheduler/rpcapi.py b/nova/scheduler/rpcapi.py index 2cfd5688f..369363bb4 100644 --- a/nova/scheduler/rpcapi.py +++ b/nova/scheduler/rpcapi.py @@ -32,6 +32,11 @@ rpcapi_opts = [ CONF = cfg.CONF CONF.register_opts(rpcapi_opts) +rpcapi_cap_opt = cfg.StrOpt('scheduler', + default=None, + 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. @@ -58,6 +63,10 @@ class SchedulerAPI(nova.openstack.common.rpc.proxy.RpcProxy): - 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. ''' # @@ -70,9 +79,16 @@ class SchedulerAPI(nova.openstack.common.rpc.proxy.RpcProxy): # 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) + default_version=self.BASE_RPC_API_VERSION, + version_cap=version_cap) def run_instance(self, ctxt, request_spec, admin_password, injected_files, requested_networks, is_first_time, |