diff options
| author | Brian Lamar <brian.lamar@rackspace.com> | 2011-08-25 11:17:31 -0400 |
|---|---|---|
| committer | Brian Lamar <brian.lamar@rackspace.com> | 2011-08-25 11:17:31 -0400 |
| commit | 423a29ff347d3911ba1a98aa224e2a29bdbb8d4c (patch) | |
| tree | 8288790ac5afdf08c65d15f5cb195e6abe2f2540 | |
| parent | 0e3986e71f4bbc848e81f18d6c3e6ad33ab3684c (diff) | |
Set error state when migration prep fails.
| -rw-r--r-- | nova/compute/manager.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index c29eef07f..de43a5ced 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -929,8 +929,11 @@ class ComputeManager(manager.SchedulerDependentManager): instance_ref = self.db.instance_get_by_uuid(context, instance_id) if instance_ref['host'] == FLAGS.host: - raise exception.Error(_( - 'Migration error: destination same as source!')) + self._instance_update(context, + instance_id, + vm_state=vm_states.ERROR) + msg = _('Migration error: destination same as source!') + raise exception.Error(msg) old_instance_type = self.db.instance_type_get(context, instance_ref['instance_type_id']) |