diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-05-16 21:17:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-05-16 21:17:01 +0000 |
| commit | 27f5ec2754ddffb6ab1ccdeecc69816db2bfd776 (patch) | |
| tree | b3c4dedde636768ce5d25716bdef16ebf122f870 /nova | |
| parent | eb96b41a022fb2786a6bb7a4950b2826a2de46c6 (diff) | |
| parent | 4eafbbeb6545dddedb88f8e3d14c7dc13bbf24c5 (diff) | |
| download | nova-27f5ec2754ddffb6ab1ccdeecc69816db2bfd776.tar.gz nova-27f5ec2754ddffb6ab1ccdeecc69816db2bfd776.tar.xz nova-27f5ec2754ddffb6ab1ccdeecc69816db2bfd776.zip | |
Merge "Updated instance state on resize error."
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/compute/manager.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index e35ede5e4..9cb080dbe 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1346,7 +1346,14 @@ class ComputeManager(manager.SchedulerDependentManager): instance_type_ref = self.db.instance_type_get(context, migration_ref.new_instance_type_id) - network_info = self._get_instance_nw_info(context, instance_ref) + try: + network_info = self._get_instance_nw_info(context, instance_ref) + except Exception, error: + with utils.save_and_reraise_exception(): + msg = _('%s. Setting instance vm_state to ERROR') + LOG.error(msg % error) + self._set_instance_error_state(context, instance_uuid) + self.db.migration_update(context, migration_id, {'status': 'migrating'}) |