diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-08 19:44:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-08 19:44:53 +0000 |
| commit | 8a812a75ce0e72fd79d6c73d94943bfe30eb3977 (patch) | |
| tree | 36f90560ee5c5184962045e6649f07098b89743e /nova/compute | |
| parent | 885271e06e7860cca05d06d9f49ac0a2646684a8 (diff) | |
| parent | 4e02fa1964f5de3a6ba345d858623f35b24beafd (diff) | |
Merge "Add exception handler for previous deleted flavor."
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/resource_tracker.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/nova/compute/resource_tracker.py b/nova/compute/resource_tracker.py index c784fd83d..ba1915f42 100644 --- a/nova/compute/resource_tracker.py +++ b/nova/compute/resource_tracker.py @@ -453,7 +453,12 @@ class ResourceTracker(object): filtered[uuid] = migration for migration in filtered.values(): - self._update_usage_from_migration(resources, migration) + try: + self._update_usage_from_migration(resources, migration) + except exception.InstanceTypeNotFound: + LOG.warn(_("InstanceType could not be found, skipping " + "migration."), instance_uuid=uuid) + continue def _update_usage_from_instance(self, resources, instance): """Update usage for a single instance.""" |