From 80a6dc5504378ae3d96829d96c02f50b9daa3029 Mon Sep 17 00:00:00 2001 From: Cerberus Date: Wed, 9 Mar 2011 13:46:05 -0600 Subject: stuff --- nova/compute/api.py | 15 +++++++++++++-- nova/compute/manager.py | 17 ++++++++++++++--- 2 files changed, 27 insertions(+), 5 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/api.py b/nova/compute/api.py index 33d25fc4b..93f0a12c1 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -456,12 +456,23 @@ class API(base.Base): self.db.instance_update(context, instance_id, {'host': migration_ref['dest_compute'], }) - def resize(self, context, instance_id, flavor): + def resize(self, context, instance_id, flavor_id): """Resize a running instance.""" + instance = self.db.instance_get(context, instance_id) + current_instance_type = self.db.instance_type_get_by_flavor_id( + context, instance['flavor_id']) + new_instance_type = self.db.instance_type_get_by_flavor_id( + context, flavor_id) + + if current_instance_type.memory_mb > new_instance_typ.memory_mb: + raise exception.ApiError(_("Invalid flavor: cannot downsize" + "instances")) + self._cast_scheduler_message(context, {"method": "prep_resize", "args": {"topic": FLAGS.compute_topic, - "instance_id": instance_id, }},) + "instance_id": instance_id, + "instance_type": new_instance_type}}) def pause(self, context, instance_id): """Pause the given instance.""" diff --git a/nova/compute/manager.py b/nova/compute/manager.py index b3e864154..f85ad91df 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -447,7 +447,7 @@ class ComputeManager(manager.Manager): @exception.wrap_exception @checks_instance_lock - def prep_resize(self, context, instance_id): + def prep_resize(self, context, instance_id, flavor_id): """Initiates the process of moving a running instance to another host, possibly changing the RAM and disk size in the process""" context = context.elevated() @@ -456,12 +456,17 @@ class ComputeManager(manager.Manager): raise exception.Error(_( 'Migration error: destination same as source!')) + instance_type = self.db.instance_type_get_by_flavor_id(context, + flavor_id) migration_ref = self.db.migration_create(context, {'instance_id': instance_id, 'source_compute': instance_ref['host'], 'dest_compute': FLAGS.host, 'dest_host': self.driver.get_host_ip_addr(), + 'old_flavor': instance_type['flavor_id'], + 'new_flavor': flavor_id, 'status': 'pre-migrating'}) + LOG.audit(_('instance %s: migrating to '), instance_id, context=context) topic = self.db.queue_get_for(context, FLAGS.compute_topic, @@ -487,8 +492,14 @@ class ComputeManager(manager.Manager): self.db.migration_update(context, migration_id, {'status': 'post-migrating', }) - #TODO(mdietz): This is where we would update the VM record - #after resizing + #TODO(mdietz): apply the rest of the instance_type attributes going + #after they're supported + self.db.instance_update(context, instance_ref, + dict(memory_mb=instance_type['memory_mb'], + vcpus=instance_type['vcpus'], + local_gb=instance_type['local_gb'])) + self.driver.resize_instance(context, instance_ref) + service = self.db.service_get_by_host_and_topic(context, migration_ref['dest_compute'], FLAGS.compute_topic) topic = self.db.queue_get_for(context, FLAGS.compute_topic, -- cgit From 4a9f4f4eef4e6fd6ab84ec2e03437144f9ab62f8 Mon Sep 17 00:00:00 2001 From: Cerberus Date: Thu, 10 Mar 2011 16:07:50 -0600 Subject: More resize --- nova/compute/manager.py | 68 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 44 insertions(+), 24 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 399356a13..f73e81345 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -429,21 +429,37 @@ class ComputeManager(manager.Manager): instance_ref = self.db.instance_get(context, instance_id) migration_ref = self.db.migration_get(context, migration_id) - #TODO(mdietz): we may want to split these into separate methods. - if migration_ref['source_compute'] == FLAGS.host: - self.driver._start(instance_ref) - self.db.migration_update(context, migration_id, - {'status': 'reverted'}) - else: - self.driver.destroy(instance_ref) - topic = self.db.queue_get_for(context, FLAGS.compute_topic, - instance_ref['host']) - rpc.cast(context, topic, - {'method': 'revert_resize', - 'args': { - 'migration_id': migration_ref['id'], - 'instance_id': instance_id, }, - }) + self.driver.destroy(instance_ref) + topic = self.db.queue_get_for(context, FLAGS.compute_topic, + instance_ref['host']) + rpc.cast(context, topic, + {'method': 'finish_revert_resize', + 'args': { + 'migration_id': migration_ref['id'], + 'instance_id': instance_id, }, + }) + + @exception.wrap_exception + @checks_instance_lock + def finish_revert_resize(self, context, instance_id, migration_id): + """Finishes the second half of reverting a resize, powering back on + the source instance and reverting the resized attributes in the + database""" + instance_ref = self.db.instance_get(context, instance_id) + migration_ref = self.db.migration_get(context, migration_id) + instance_type = self.db.instance_type_get_by_flavor_id(context, + migration_ref['old_flavor_id']) + + #Just roll back the record. There's no need to resize down since + #the 'old' VM already has the preferred attributes + self.db.instance_update(context, + dict(memory_mb=instance_type['memory_mb'], + vcpus=instance_type['vcpus'], + local_gb=instance_type['local_gb'])) + + self.driver._start(instance_ref) + self.db.migration_update(context, migration_id, + {'status': 'reverted'}) @exception.wrap_exception @checks_instance_lock @@ -463,8 +479,8 @@ class ComputeManager(manager.Manager): 'source_compute': instance_ref['host'], 'dest_compute': FLAGS.host, 'dest_host': self.driver.get_host_ip_addr(), - 'old_flavor': instance_type['flavor_id'], - 'new_flavor': flavor_id, + 'old_flavor_id': instance_type['flavor_id'], + 'new_flavor_id': flavor_id, 'status': 'pre-migrating'}) LOG.audit(_('instance %s: migrating to '), instance_id, @@ -492,13 +508,7 @@ class ComputeManager(manager.Manager): self.db.migration_update(context, migration_id, {'status': 'post-migrating', }) - #TODO(mdietz): apply the rest of the instance_type attributes going - #after they're supported - self.db.instance_update(context, instance_ref, - dict(memory_mb=instance_type['memory_mb'], - vcpus=instance_type['vcpus'], - local_gb=instance_type['local_gb'])) - self.driver.resize_instance(context, instance_ref) + service = self.db.service_get_by_host_and_topic(context, migration_ref['dest_compute'], FLAGS.compute_topic) @@ -520,7 +530,17 @@ class ComputeManager(manager.Manager): migration_ref = self.db.migration_get(context, migration_id) instance_ref = self.db.instance_get(context, migration_ref['instance_id']) + + #TODO(mdietz): apply the rest of the instance_type attributes going + #after they're supported + instance_type = self.db.instance_type_get_by_flavor_id(context, + migration_ref['new_flavor_id']) + self.db.instance_update(context, instance_ref, + dict(memory_mb=instance_type['memory_mb'], + vcpus=instance_type['vcpus'], + local_gb=instance_type['local_gb'])) + self.driver.resize_instance(instance_ref, disk_info) self.driver.finish_resize(instance_ref, disk_info) self.db.migration_update(context, migration_id, -- cgit From 1c4afe23157233b7081872ccbc6ea5fa1ff0015a Mon Sep 17 00:00:00 2001 From: Cerberus Date: Fri, 11 Mar 2011 17:30:51 -0600 Subject: Some unit tests --- nova/compute/api.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/api.py b/nova/compute/api.py index 1393c01d5..0dc2bb3d3 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -460,10 +460,13 @@ class API(base.Base): def resize(self, context, instance_id, flavor_id): """Resize a running instance.""" instance = self.db.instance_get(context, instance_id) - current_instance_type = self.db.instance_type_get_by_flavor_id( - context, instance['flavor_id']) + current_instance_type = self.db.instance_type_get_by_name( + context, instance['instance_type']) + new_instance_type = self.db.instance_type_get_by_flavor_id( - context, flavor_id) + context, flavor_id) + if not new_instance_type: + raise exception.ApiError(_("Requested flavor does not exist")) if current_instance_type.memory_mb > new_instance_typ.memory_mb: raise exception.ApiError(_("Invalid flavor: cannot downsize" -- cgit From 1ebae577150ce64d81d102c2e162acfe5a72528b Mon Sep 17 00:00:00 2001 From: Cerberus Date: Mon, 14 Mar 2011 12:07:27 -0500 Subject: Test changes --- nova/compute/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nova/compute') diff --git a/nova/compute/api.py b/nova/compute/api.py index 3920f2af8..9d238c7d0 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -482,7 +482,7 @@ class API(base.Base): {"method": "prep_resize", "args": {"topic": FLAGS.compute_topic, "instance_id": instance_id, - "instance_type": new_instance_type}}) + "flavor_id": flavor_id}}) def pause(self, context, instance_id): """Pause the given instance.""" -- cgit From e509cd70e7a2e8a430b2b24af50adcf1ad763564 Mon Sep 17 00:00:00 2001 From: "matt.dietz@rackspace.com" <> Date: Mon, 14 Mar 2011 17:24:39 +0000 Subject: Test fixes and some typos --- nova/compute/api.py | 4 ++-- nova/compute/manager.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/api.py b/nova/compute/api.py index 9d238c7d0..0e9bf2424 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -468,13 +468,13 @@ class API(base.Base): instance = self.db.instance_get(context, instance_id) current_instance_type = self.db.instance_type_get_by_name( context, instance['instance_type']) - + new_instance_type = self.db.instance_type_get_by_flavor_id( context, flavor_id) if not new_instance_type: raise exception.ApiError(_("Requested flavor does not exist")) - if current_instance_type.memory_mb > new_instance_typ.memory_mb: + if current_instance_type['memory_mb'] > new_instance_type['memory_mb']: raise exception.ApiError(_("Invalid flavor: cannot downsize" "instances")) diff --git a/nova/compute/manager.py b/nova/compute/manager.py index f73e81345..57d175ec7 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -479,7 +479,7 @@ class ComputeManager(manager.Manager): 'source_compute': instance_ref['host'], 'dest_compute': FLAGS.host, 'dest_host': self.driver.get_host_ip_addr(), - 'old_flavor_id': instance_type['flavor_id'], + 'old_flavor_id': instance_type['flavorid'], 'new_flavor_id': flavor_id, 'status': 'pre-migrating'}) -- cgit From c94ec9a5bab6c07b402b68e2f4ff081247a27cda Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Mon, 14 Mar 2011 14:17:58 -0700 Subject: Initial implementation of refresh instance states --- nova/compute/driver.py | 38 ++++++++++++++++++++++++++++++ nova/compute/manager.py | 56 ++++++++++++++++++++++++++++++++++++++++++++- nova/compute/power_state.py | 16 +++++++++---- 3 files changed, 105 insertions(+), 5 deletions(-) create mode 100644 nova/compute/driver.py (limited to 'nova/compute') diff --git a/nova/compute/driver.py b/nova/compute/driver.py new file mode 100644 index 000000000..bda82c60a --- /dev/null +++ b/nova/compute/driver.py @@ -0,0 +1,38 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 Justin Santa Barbara +# 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. + +""" +Driver base-classes: + + (Beginning of) the contract that compute drivers must follow, and shared + types that support that contract +""" + +from nova.compute import power_state + + +class InstanceInfo(object): + def __init__(self, name, state): + self.name = name + assert state in power_state.valid_states() + self.state = state + + +class ComputeDriver(object): + def list_instances_detail(self): + """Return a list of InstanceInfo for all registered VMs""" + raise NotImplementedError() diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 0cab10fc3..057371d40 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -2,6 +2,7 @@ # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. +# Copyright 2011 Justin Santa Barbara # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may @@ -51,6 +52,7 @@ from nova import manager from nova import rpc from nova import utils from nova.compute import power_state +from nova.compute import driver FLAGS = flags.FLAGS flags.DEFINE_string('instances_path', '$state_path/instances', @@ -115,7 +117,9 @@ class ComputeManager(manager.Manager): # and redocument the module docstring if not compute_driver: compute_driver = FLAGS.compute_driver - self.driver = utils.import_object(compute_driver) + self.driver = utils.check_instance(utils.import_object( + compute_driver), + driver.ComputeDriver) self.network_manager = utils.import_object(FLAGS.network_manager) self.volume_manager = utils.import_object(FLAGS.volume_manager) super(ComputeManager, self).__init__(*args, **kwargs) @@ -974,3 +978,53 @@ class ComputeManager(manager.Manager): for volume in instance_ref['volumes']: self.db.volume_update(ctxt, volume['id'], {'status': 'in-use'}) + + def periodic_tasks(self, context=None): + """Tasks to be run at a periodic interval.""" + super(ComputeManager, self).periodic_tasks(context) + try: + self._poll_instance_states(context) + except Exception as ex: + LOG.warning(_("Error during instance poll: %s"), + unicode(ex)) + + def _poll_instance_states(self, context): + vm_instances = self.driver.list_instances_detail(context) + vm_instances = dict((vm.name, vm) for vm in vm_instances) + + # Keep a list of VMs not in the DB, cross them off as we find them + vms_not_found_in_db = [vm.name for vm in vm_instances] + + db_instances = self.db.instance_get_all_by_host(context, self.host) + for db_instance in db_instances: + name = db_instance['name'] + vm_instance = vm_instances.get(name) + if vm_instance is None: + LOG.info(_("Found instance '%(name)' in DB but no VM. " + "Shutting off.") % locals()) + vm_state = power_state.SHUTOFF + else: + vm_state = vm_instance.state + vms_not_found_in_db.remove(name) + + db_state = db_instance['state'] + if vm_state != db_state: + LOG.info(_("DB/VM state mismatch. Changing state from " + "%(db_state) to %(vm_state)") % locals()) + self.db.instance_set_state(context, + db_instance['id'], + vm_state) + + if vm_state == power_state.SHUTOFF: + # TODO(soren): This is what the compute manager does when you + # terminate an instance. At some point I figure we'll have a + # "terminated" state and some sort of cleanup job that runs + # occasionally, cleaning them out. + self.db.instance_destroy(context, db_instance['id']) + + # Are there VMs not in the DB? + for vm_not_found_in_db in vms_not_found_in_db: + name = vm_not_found_in_db + #TODO(justinsb): What to do here? Adopt it? Shut it down? + LOG.warning(_("Found VM not in DB: %(name). Ignoring") + % locals()) diff --git a/nova/compute/power_state.py b/nova/compute/power_state.py index adfc2dff0..145362f97 100644 --- a/nova/compute/power_state.py +++ b/nova/compute/power_state.py @@ -2,6 +2,7 @@ # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. +# Copyright 2011 Justin Santa Barbara # All Rights Reserved. # Copyright (c) 2010 Citrix Systems, Inc. # @@ -19,6 +20,7 @@ """The various power states that a VM can be in.""" +#NOTE(justinsb): These are the virDomainState values from libvirt NOSTATE = 0x00 RUNNING = 0x01 BLOCKED = 0x02 @@ -29,9 +31,8 @@ CRASHED = 0x06 SUSPENDED = 0x07 FAILED = 0x08 - -def name(code): - d = { +#TODO(justinsb): Power state really needs to be a proper class... +_STATE_MAP = { NOSTATE: 'pending', RUNNING: 'running', BLOCKED: 'blocked', @@ -41,4 +42,11 @@ def name(code): CRASHED: 'crashed', SUSPENDED: 'suspended', FAILED: 'failed to spawn'} - return d[code] + + +def name(code): + return _STATE_MAP[code] + + +def valid_states(): + return _STATE_MAP.values() -- cgit From 738653b6b4ac744519a050fe50e7c795a7c63579 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Mon, 14 Mar 2011 15:11:14 -0700 Subject: Added test and fixed up code so that it works --- nova/compute/manager.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 057371d40..a7727a239 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -981,26 +981,32 @@ class ComputeManager(manager.Manager): def periodic_tasks(self, context=None): """Tasks to be run at a periodic interval.""" - super(ComputeManager, self).periodic_tasks(context) + error_list = super(ComputeManager, self).periodic_tasks(context) + if error_list is None: + error_list = [] + try: self._poll_instance_states(context) except Exception as ex: LOG.warning(_("Error during instance poll: %s"), unicode(ex)) + error_list.append(ex) + return error_list def _poll_instance_states(self, context): - vm_instances = self.driver.list_instances_detail(context) + vm_instances = self.driver.list_instances_detail() vm_instances = dict((vm.name, vm) for vm in vm_instances) # Keep a list of VMs not in the DB, cross them off as we find them vms_not_found_in_db = [vm.name for vm in vm_instances] db_instances = self.db.instance_get_all_by_host(context, self.host) + for db_instance in db_instances: name = db_instance['name'] vm_instance = vm_instances.get(name) if vm_instance is None: - LOG.info(_("Found instance '%(name)' in DB but no VM. " + LOG.info(_("Found instance '%(name)s' in DB but no VM. " "Shutting off.") % locals()) vm_state = power_state.SHUTOFF else: @@ -1010,7 +1016,7 @@ class ComputeManager(manager.Manager): db_state = db_instance['state'] if vm_state != db_state: LOG.info(_("DB/VM state mismatch. Changing state from " - "%(db_state) to %(vm_state)") % locals()) + "'%(db_state)s' to '%(vm_state)s'") % locals()) self.db.instance_set_state(context, db_instance['id'], vm_state) @@ -1026,5 +1032,5 @@ class ComputeManager(manager.Manager): for vm_not_found_in_db in vms_not_found_in_db: name = vm_not_found_in_db #TODO(justinsb): What to do here? Adopt it? Shut it down? - LOG.warning(_("Found VM not in DB: %(name). Ignoring") + LOG.warning(_("Found VM not in DB: '%(name)s'. Ignoring") % locals()) -- cgit From 9dce9ee5fe5a1df018b9a606a3ea35b2dbfc987e Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Mon, 14 Mar 2011 15:37:29 -0700 Subject: Clarified message when a VM is not running but still in DB --- nova/compute/manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index a7727a239..019bb3c89 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1007,7 +1007,7 @@ class ComputeManager(manager.Manager): vm_instance = vm_instances.get(name) if vm_instance is None: LOG.info(_("Found instance '%(name)s' in DB but no VM. " - "Shutting off.") % locals()) + "Setting state to shutoff.") % locals()) vm_state = power_state.SHUTOFF else: vm_state = vm_instance.state -- cgit From 74987666f89b4d15ffcf17b43b3752135ba08a65 Mon Sep 17 00:00:00 2001 From: Cerberus Date: Tue, 15 Mar 2011 18:48:17 -0500 Subject: A few fixes --- nova/compute/manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 39b28f6a9..307c91650 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -541,7 +541,7 @@ class ComputeManager(manager.Manager): #after they're supported instance_type = self.db.instance_type_get_by_flavor_id(context, migration_ref['new_flavor_id']) - self.db.instance_update(context, instance_ref, + self.db.instance_update(context, instance_id, dict(memory_mb=instance_type['memory_mb'], vcpus=instance_type['vcpus'], local_gb=instance_type['local_gb'])) -- cgit From d1469d1566a67d41cb4de4ff06deaf441e099062 Mon Sep 17 00:00:00 2001 From: Cerberus Date: Wed, 16 Mar 2011 11:26:40 -0500 Subject: Some typos --- nova/compute/api.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'nova/compute') diff --git a/nova/compute/api.py b/nova/compute/api.py index 0e9bf2424..08947eb3a 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -443,6 +443,8 @@ class API(base.Base): params = {'migration_id': migration_ref['id']} self._cast_compute_message('revert_resize', context, instance_id, migration_ref['dest_compute'], params=params) + self.db.migration_update(context, migration_ref['id'], + {'status': 'reverted'}) def confirm_resize(self, context, instance_id): """Confirms a migration/resize, deleting the 'old' instance in the @@ -458,7 +460,7 @@ class API(base.Base): self._cast_compute_message('confirm_resize', context, instance_id, migration_ref['source_compute'], params=params) - self.db.migration_update(context, migration_id, + self.db.migration_update(context, migration_ref['id'], {'status': 'confirmed'}) self.db.instance_update(context, instance_id, {'host': migration_ref['dest_compute'], }) -- cgit From dee86f53b0d1dccbc69d354b66ca7a4767e81d43 Mon Sep 17 00:00:00 2001 From: Cerberus Date: Wed, 16 Mar 2011 11:54:10 -0500 Subject: tweak --- nova/compute/manager.py | 1 - 1 file changed, 1 deletion(-) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 307c91650..1587660a3 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -546,7 +546,6 @@ class ComputeManager(manager.Manager): vcpus=instance_type['vcpus'], local_gb=instance_type['local_gb'])) - self.driver.resize_instance(instance_ref, disk_info) self.driver.finish_resize(instance_ref, disk_info) self.db.migration_update(context, migration_id, -- cgit From ebd452eab95c2f205d3f7419c08c288030c38aba Mon Sep 17 00:00:00 2001 From: Cerberus Date: Wed, 16 Mar 2011 13:53:49 -0500 Subject: chchchchchanges --- nova/compute/manager.py | 1 + 1 file changed, 1 insertion(+) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 1587660a3..351e02f51 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -546,6 +546,7 @@ class ComputeManager(manager.Manager): vcpus=instance_type['vcpus'], local_gb=instance_type['local_gb'])) + instance_ref = self.db.instance_get(context, instance_id) self.driver.finish_resize(instance_ref, disk_info) self.db.migration_update(context, migration_id, -- cgit From 1d4d0e26ae6ece5e68417deaa4ddcf4b7757bd37 Mon Sep 17 00:00:00 2001 From: Cerberus Date: Wed, 16 Mar 2011 14:09:14 -0500 Subject: Fudge --- nova/compute/api.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'nova/compute') diff --git a/nova/compute/api.py b/nova/compute/api.py index 08947eb3a..ddf439b35 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -468,11 +468,15 @@ class API(base.Base): def resize(self, context, instance_id, flavor_id): """Resize a running instance.""" instance = self.db.instance_get(context, instance_id) + LOG.debug(_("Resizing instance %s to flavor %d") % + (instance.name, flavor_id)) current_instance_type = self.db.instance_type_get_by_name( context, instance['instance_type']) new_instance_type = self.db.instance_type_get_by_flavor_id( context, flavor_id) + LOG.debug(_("Old instance type %s -> New instance type %s") % + (current_instance_type['name'], new_instance_type['name'])) if not new_instance_type: raise exception.ApiError(_("Requested flavor does not exist")) -- cgit From bf2f491f3e7aa5522d306c2182c3d220eb49a55f Mon Sep 17 00:00:00 2001 From: Cerberus Date: Wed, 16 Mar 2011 17:56:48 -0500 Subject: foo --- nova/compute/manager.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 351e02f51..e69544b6e 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -458,7 +458,7 @@ class ComputeManager(manager.Manager): #Just roll back the record. There's no need to resize down since #the 'old' VM already has the preferred attributes - self.db.instance_update(context, + self.db.instance_update(context, instance_id dict(memory_mb=instance_type['memory_mb'], vcpus=instance_type['vcpus'], local_gb=instance_type['local_gb'])) @@ -542,7 +542,8 @@ class ComputeManager(manager.Manager): instance_type = self.db.instance_type_get_by_flavor_id(context, migration_ref['new_flavor_id']) self.db.instance_update(context, instance_id, - dict(memory_mb=instance_type['memory_mb'], + dict(instance_type=instance_type['name'], + memory_mb=instance_type['memory_mb'], vcpus=instance_type['vcpus'], local_gb=instance_type['local_gb'])) -- cgit From 3c0ae08b71c860383c215fa30c36693fd80f34c2 Mon Sep 17 00:00:00 2001 From: Cerberus Date: Wed, 16 Mar 2011 17:58:16 -0500 Subject: foo --- nova/compute/manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index e69544b6e..3135d5801 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -458,7 +458,7 @@ class ComputeManager(manager.Manager): #Just roll back the record. There's no need to resize down since #the 'old' VM already has the preferred attributes - self.db.instance_update(context, instance_id + self.db.instance_update(context, instance_id, dict(memory_mb=instance_type['memory_mb'], vcpus=instance_type['vcpus'], local_gb=instance_type['local_gb'])) -- cgit From aa13754d04c17ae9985017e22ae4f68916bc2781 Mon Sep 17 00:00:00 2001 From: Cerberus Date: Thu, 17 Mar 2011 10:03:47 -0500 Subject: Foo --- nova/compute/manager.py | 1 - 1 file changed, 1 deletion(-) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 3135d5801..b8c3c24cd 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -547,7 +547,6 @@ class ComputeManager(manager.Manager): vcpus=instance_type['vcpus'], local_gb=instance_type['local_gb'])) - instance_ref = self.db.instance_get(context, instance_id) self.driver.finish_resize(instance_ref, disk_info) self.db.migration_update(context, migration_id, -- cgit From 4f1f5bb1ed2cbb57e9ba8ea481ae31c0e6acc7bd Mon Sep 17 00:00:00 2001 From: Cerberus Date: Thu, 17 Mar 2011 11:03:07 -0500 Subject: refactoring --- nova/compute/manager.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index b8c3c24cd..6b784f1e3 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -463,7 +463,7 @@ class ComputeManager(manager.Manager): vcpus=instance_type['vcpus'], local_gb=instance_type['local_gb'])) - self.driver._start(instance_ref) + self.driver.revert_resize(instance_ref) self.db.migration_update(context, migration_id, {'status': 'reverted'}) @@ -514,8 +514,6 @@ class ComputeManager(manager.Manager): self.db.migration_update(context, migration_id, {'status': 'post-migrating', }) - - service = self.db.service_get_by_host_and_topic(context, migration_ref['dest_compute'], FLAGS.compute_topic) topic = self.db.queue_get_for(context, FLAGS.compute_topic, @@ -536,7 +534,6 @@ class ComputeManager(manager.Manager): migration_ref = self.db.migration_get(context, migration_id) instance_ref = self.db.instance_get(context, migration_ref['instance_id']) - #TODO(mdietz): apply the rest of the instance_type attributes going #after they're supported instance_type = self.db.instance_type_get_by_flavor_id(context, -- cgit From d6ae8e4c2f6011497b1db23fcbafb23b663f924d Mon Sep 17 00:00:00 2001 From: Cerberus Date: Thu, 17 Mar 2011 11:24:24 -0500 Subject: Foo --- nova/compute/manager.py | 1 + 1 file changed, 1 insertion(+) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 6b784f1e3..186b6f6a5 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -544,6 +544,7 @@ class ComputeManager(manager.Manager): vcpus=instance_type['vcpus'], local_gb=instance_type['local_gb'])) + instance_ref = self.db.instance_get(context, instance_id) self.driver.finish_resize(instance_ref, disk_info) self.db.migration_update(context, migration_id, -- cgit From 686e113188aaf8195aed7bea8bf70c21b6bff498 Mon Sep 17 00:00:00 2001 From: Cerberus Date: Thu, 17 Mar 2011 12:04:49 -0500 Subject: Mapping the resize status --- nova/compute/manager.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 186b6f6a5..7993298b9 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -544,6 +544,8 @@ class ComputeManager(manager.Manager): vcpus=instance_type['vcpus'], local_gb=instance_type['local_gb'])) + # reload the updated instance ref + # FIXME: is there reload functionality? instance_ref = self.db.instance_get(context, instance_id) self.driver.finish_resize(instance_ref, disk_info) -- cgit From 7ae8f5563c42d7c5dc67047dd9c42e982281d80b Mon Sep 17 00:00:00 2001 From: Soren Hansen Date: Tue, 22 Mar 2011 16:53:43 +0100 Subject: Apparantly a more common problem than first thought. --- nova/compute/manager.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 576937cd8..67290c8dc 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -41,9 +41,10 @@ import string import socket import sys import tempfile -import time import functools +from eventlet import greenthread + from nova import exception from nova import flags from nova import log as logging @@ -800,7 +801,7 @@ class ComputeManager(manager.Manager): return self.driver.update_available_resource(context, self.host) - def pre_live_migration(self, context, instance_id): + def pre_live_migration(self, context, instance_id, time=None): """Preparations for live migration at dest host. :param context: security context @@ -808,6 +809,9 @@ class ComputeManager(manager.Manager): """ + if not time: + time = greenthread + # Getting instance info instance_ref = self.db.instance_get(context, instance_id) ec2_id = instance_ref['hostname'] -- cgit From 116c0d52d21ebd6ed55a61467aac5d8c06a4b086 Mon Sep 17 00:00:00 2001 From: "matt.dietz@rackspace.com" <> Date: Tue, 22 Mar 2011 17:46:17 +0000 Subject: Merge stuff --- nova/compute/api.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/api.py b/nova/compute/api.py index dbf99e7c5..748aba004 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -489,15 +489,15 @@ class API(base.Base): def resize(self, context, instance_id, flavor_id): """Resize a running instance.""" instance = self.db.instance_get(context, instance_id) - LOG.debug(_("Resizing instance %(instance_type['name'] to flavor" - "%(flavor_id)") % locals()) current_instance_type = self.db.instance_type_get_by_name( context, instance['instance_type']) new_instance_type = self.db.instance_type_get_by_flavor_id( context, flavor_id) - LOG.debug(_("Old instance type %s -> New instance type %s"), - (current_instance_type['name'], new_instance_type['name'])) + current_instance_type_name = current_instance_type['name'] + new_instance_type_name = new_instance_type['name'] + LOG.debug(_("Old instance type %(current_instance_type_name)s, " + " new instance type %(new_instance_type_name)s") % locals()) if not new_instance_type: raise exception.ApiError(_("Requested flavor does not exist")) -- cgit From c8e8b44ef27e49b3986659ee0cb6bd77b38430d8 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Tue, 22 Mar 2011 22:01:39 -0700 Subject: Forgot this in the rename of check_instance -> check_isinstance --- nova/compute/manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 019bb3c89..b21f0b836 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -117,7 +117,7 @@ class ComputeManager(manager.Manager): # and redocument the module docstring if not compute_driver: compute_driver = FLAGS.compute_driver - self.driver = utils.check_instance(utils.import_object( + self.driver = utils.check_isinstance(utils.import_object( compute_driver), driver.ComputeDriver) self.network_manager = utils.import_object(FLAGS.network_manager) -- cgit From 19da125805eedbfcfd202abac4a90c57e6c538c4 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Tue, 22 Mar 2011 22:38:37 -0700 Subject: Filled out the base-driver contract, so it's not a false-promise --- nova/compute/driver.py | 38 -------------------------------------- nova/compute/manager.py | 3 ++- 2 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 nova/compute/driver.py (limited to 'nova/compute') diff --git a/nova/compute/driver.py b/nova/compute/driver.py deleted file mode 100644 index bda82c60a..000000000 --- a/nova/compute/driver.py +++ /dev/null @@ -1,38 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright 2011 Justin Santa Barbara -# 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. - -""" -Driver base-classes: - - (Beginning of) the contract that compute drivers must follow, and shared - types that support that contract -""" - -from nova.compute import power_state - - -class InstanceInfo(object): - def __init__(self, name, state): - self.name = name - assert state in power_state.valid_states() - self.state = state - - -class ComputeDriver(object): - def list_instances_detail(self): - """Return a list of InstanceInfo for all registered VMs""" - raise NotImplementedError() diff --git a/nova/compute/manager.py b/nova/compute/manager.py index b21f0b836..f37651ea6 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -52,7 +52,7 @@ from nova import manager from nova import rpc from nova import utils from nova.compute import power_state -from nova.compute import driver +from nova.virt import driver FLAGS = flags.FLAGS flags.DEFINE_string('instances_path', '$state_path/instances', @@ -441,6 +441,7 @@ class ComputeManager(manager.Manager): #TODO(mdietz): we may want to split these into separate methods. if migration_ref['source_compute'] == FLAGS.host: + #NOTE(justinsb): Naughty calling of internal method self.driver._start(instance_ref) self.db.migration_update(context, migration_id, {'status': 'reverted'}) -- cgit From a0432e417a13fd9579c40bdd54f0201b06470f45 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Tue, 22 Mar 2011 22:42:12 -0700 Subject: Added note about the advantages of using a type vs using a set of global constants --- nova/compute/power_state.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'nova/compute') diff --git a/nova/compute/power_state.py b/nova/compute/power_state.py index 145362f97..d304285b2 100644 --- a/nova/compute/power_state.py +++ b/nova/compute/power_state.py @@ -31,7 +31,9 @@ CRASHED = 0x06 SUSPENDED = 0x07 FAILED = 0x08 -#TODO(justinsb): Power state really needs to be a proper class... +#TODO(justinsb): Power state really needs to be a proper class, +# so that we're not locked into the libvirt status codes and can put mapping +# logic here rather than spread throughout the code _STATE_MAP = { NOSTATE: 'pending', RUNNING: 'running', -- cgit From a4d78e44d7ca35a6cca4454667cab743409fd95a Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Tue, 22 Mar 2011 22:45:15 -0700 Subject: Added space in between # and TODO in #TODO --- nova/compute/manager.py | 2 +- nova/compute/power_state.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index f37651ea6..cfd2b0ac4 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1032,6 +1032,6 @@ class ComputeManager(manager.Manager): # Are there VMs not in the DB? for vm_not_found_in_db in vms_not_found_in_db: name = vm_not_found_in_db - #TODO(justinsb): What to do here? Adopt it? Shut it down? + # TODO(justinsb): What to do here? Adopt it? Shut it down? LOG.warning(_("Found VM not in DB: '%(name)s'. Ignoring") % locals()) diff --git a/nova/compute/power_state.py b/nova/compute/power_state.py index d304285b2..ed50e492e 100644 --- a/nova/compute/power_state.py +++ b/nova/compute/power_state.py @@ -31,7 +31,7 @@ CRASHED = 0x06 SUSPENDED = 0x07 FAILED = 0x08 -#TODO(justinsb): Power state really needs to be a proper class, +# TODO(justinsb): Power state really needs to be a proper class, # so that we're not locked into the libvirt status codes and can put mapping # logic here rather than spread throughout the code _STATE_MAP = { -- cgit From a822941d1fbfcfff7d52e2e42f2a50cb8aca6f0d Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Wed, 23 Mar 2011 01:02:13 -0700 Subject: Report the exception (happens when can't import libvirt) --- nova/compute/manager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 576937cd8..4f338135b 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -118,8 +118,8 @@ class ComputeManager(manager.Manager): try: self.driver = utils.import_object(compute_driver) - except ImportError: - LOG.error("Unable to load the virtualization driver.") + except ImportError as e: + LOG.error(_("Unable to load the virtualization driver: %s") % (e)) sys.exit(1) self.network_manager = utils.import_object(FLAGS.network_manager) -- cgit From c3d47689a762bfa4aa38c7d4700bb1969d37d1d1 Mon Sep 17 00:00:00 2001 From: "matt.dietz@rackspace.com" <> Date: Wed, 23 Mar 2011 18:56:23 +0000 Subject: merge prop changes --- nova/compute/api.py | 13 ++++++++++++- nova/compute/manager.py | 8 ++++---- 2 files changed, 16 insertions(+), 5 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/api.py b/nova/compute/api.py index 748aba004..78110c048 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -253,6 +253,16 @@ class API(base.Base): return [dict(x.iteritems()) for x in instances] + def has_finished_migration(self, context, instance_id): + """Retrieves whether or not a finished migration exists for + an instance""" + try: + db.migration_get_by_instance_and_status(ctxt, inst['id'], + 'finished') + return True + except Exception, e: + return False + def ensure_default_security_group(self, context): """ Create security group for the security context if it does not already exist @@ -499,7 +509,8 @@ class API(base.Base): LOG.debug(_("Old instance type %(current_instance_type_name)s, " " new instance type %(new_instance_type_name)s") % locals()) if not new_instance_type: - raise exception.ApiError(_("Requested flavor does not exist")) + raise exception.ApiError(_("Requested flavor %(flavor_id)d " + "does not exist") % locals()) if current_instance_type['memory_mb'] >= \ new_instance_type['memory_mb']: diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 78ef33ac2..ac63f68ea 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -458,8 +458,8 @@ class ComputeManager(manager.Manager): instance_type = self.db.instance_type_get_by_flavor_id(context, migration_ref['old_flavor_id']) - #Just roll back the record. There's no need to resize down since - #the 'old' VM already has the preferred attributes + # Just roll back the record. There's no need to resize down since + # the 'old' VM already has the preferred attributes self.db.instance_update(context, instance_id, dict(memory_mb=instance_type['memory_mb'], vcpus=instance_type['vcpus'], @@ -536,8 +536,8 @@ class ComputeManager(manager.Manager): migration_ref = self.db.migration_get(context, migration_id) instance_ref = self.db.instance_get(context, migration_ref['instance_id']) - #TODO(mdietz): apply the rest of the instance_type attributes going - #after they're supported + # TODO(mdietz): apply the rest of the instance_type attributes going + # after they're supported instance_type = self.db.instance_type_get_by_flavor_id(context, migration_ref['new_flavor_id']) self.db.instance_update(context, instance_id, -- cgit From 5a5c7d22e7a00c9a3b34f8c08db70b644eee2d92 Mon Sep 17 00:00:00 2001 From: "matt.dietz@rackspace.com" <> Date: Wed, 23 Mar 2011 19:16:03 +0000 Subject: Unit test cleanup --- nova/compute/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nova/compute') diff --git a/nova/compute/api.py b/nova/compute/api.py index 78110c048..c2738f6f5 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -257,7 +257,7 @@ class API(base.Base): """Retrieves whether or not a finished migration exists for an instance""" try: - db.migration_get_by_instance_and_status(ctxt, inst['id'], + db.migration_get_by_instance_and_status(context, instance_id, 'finished') return True except Exception, e: -- cgit From abb764f51385a0b811b23379d78f7db027d4cca5 Mon Sep 17 00:00:00 2001 From: Josh Kearney Date: Wed, 23 Mar 2011 14:41:35 -0500 Subject: Automatically unrescue instances after a given timeout --- nova/compute/manager.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 576937cd8..3834c33ab 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -65,8 +65,11 @@ flags.DEFINE_string('console_host', socket.gethostname(), 'Console proxy host to use to connect to instances on' 'this host.') flags.DEFINE_integer('live_migration_retry_count', 30, - ("Retry count needed in live_migration." - " sleep 1 sec for each count")) + "Retry count needed in live_migration." + " sleep 1 sec for each count") +flags.DEFINE_integer("rescue_timeout", 0, + "Automatically unrescue an instance after N hours." + " Set to 0 to disable.") LOG = logging.getLogger('nova.compute.manager') @@ -132,6 +135,11 @@ class ComputeManager(manager.Manager): """ self.driver.init_host(host=self.host) + def periodic_tasks(self, context=None): + """Tasks to be run at a periodic interval.""" + super(ComputeManager, self).periodic_tasks(context) + self.driver.poll_rescued_instances(FLAGS.rescue_timeout) + def _update_state(self, context, instance_id): """Update the state of an instance from the driver info.""" # FIXME(ja): include other fields from state? -- cgit From 83e519b734078d8214fa0dc1d518607c7c0b244a Mon Sep 17 00:00:00 2001 From: Josh Kearney Date: Wed, 23 Mar 2011 15:21:18 -0500 Subject: Only run periodic task when rescue_timeout is greater than 0 --- nova/compute/manager.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 3834c33ab..9cb210c77 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -138,7 +138,8 @@ class ComputeManager(manager.Manager): def periodic_tasks(self, context=None): """Tasks to be run at a periodic interval.""" super(ComputeManager, self).periodic_tasks(context) - self.driver.poll_rescued_instances(FLAGS.rescue_timeout) + if FLAGS.rescue_timeout > 0: + self.driver.poll_rescued_instances(FLAGS.rescue_timeout) def _update_state(self, context, instance_id): """Update the state of an instance from the driver info.""" -- cgit From 98b4f0924257dcfa12e4881950472e983f08ef1d Mon Sep 17 00:00:00 2001 From: "matt.dietz@rackspace.com" <> Date: Wed, 23 Mar 2011 21:04:42 +0000 Subject: merge prop fixes --- nova/compute/api.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/api.py b/nova/compute/api.py index c2738f6f5..01eead4ac 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -260,7 +260,7 @@ class API(base.Base): db.migration_get_by_instance_and_status(context, instance_id, 'finished') return True - except Exception, e: + except exception.NotFound: return False def ensure_default_security_group(self, context): @@ -512,10 +512,14 @@ class API(base.Base): raise exception.ApiError(_("Requested flavor %(flavor_id)d " "does not exist") % locals()) - if current_instance_type['memory_mb'] >= \ - new_instance_type['memory_mb']: + current_memory_mb = current_instance_type['memory_mb'] + new_memory_mb = new_instance_type['memory_mb'] + if current_memory_mb > new_memory_mb: raise exception.ApiError(_("Invalid flavor: cannot downsize" "instances")) + if current_memory_mb == new_memory_mb: + raise exception.ApiError(_("Invalid flavor: cannot use" + "the same flavor. ")) self._cast_scheduler_message(context, {"method": "prep_resize", -- cgit From e19b12f668fb6cd693df6834f8895fb5487953d7 Mon Sep 17 00:00:00 2001 From: Josh Kearney Date: Wed, 23 Mar 2011 18:34:47 -0500 Subject: Review feedback --- nova/compute/manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 9cb210c77..ce1ae87e3 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -68,7 +68,7 @@ flags.DEFINE_integer('live_migration_retry_count', 30, "Retry count needed in live_migration." " sleep 1 sec for each count") flags.DEFINE_integer("rescue_timeout", 0, - "Automatically unrescue an instance after N hours." + "Automatically unrescue an instance after N seconds." " Set to 0 to disable.") LOG = logging.getLogger('nova.compute.manager') -- cgit From 3c295817f91eb7c76a64d157ff4a938c85075a36 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Wed, 23 Mar 2011 18:50:30 -0700 Subject: pep8 fixes, backported some important fixes that didn't make it over from my testing system :-( --- nova/compute/manager.py | 2 +- nova/compute/power_state.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index d85ead88b..b67b27dd0 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1001,7 +1001,7 @@ class ComputeManager(manager.Manager): vm_instances = dict((vm.name, vm) for vm in vm_instances) # Keep a list of VMs not in the DB, cross them off as we find them - vms_not_found_in_db = [vm.name for vm in vm_instances] + vms_not_found_in_db = list(vm_instances.keys()) db_instances = self.db.instance_get_all_by_host(context, self.host) diff --git a/nova/compute/power_state.py b/nova/compute/power_state.py index ed50e492e..ef013b2ef 100644 --- a/nova/compute/power_state.py +++ b/nova/compute/power_state.py @@ -51,4 +51,4 @@ def name(code): def valid_states(): - return _STATE_MAP.values() + return _STATE_MAP.keys() -- cgit