diff options
| author | Hans Lindgren <hanlind@kth.se> | 2013-04-09 14:55:08 +0200 |
|---|---|---|
| committer | Hans Lindgren <hanlind@kth.se> | 2013-04-09 14:55:08 +0200 |
| commit | b5732a454a8221bb98cb6a7241b4d4fc17840c6a (patch) | |
| tree | 02346cd49e9d85fde14c79500faddf40e6a928f3 /nova/scheduler/manager.py | |
| parent | 05f5106c198a596f22adadab1ddf6929ab9c247a (diff) | |
| download | nova-b5732a454a8221bb98cb6a7241b4d4fc17840c6a.tar.gz nova-b5732a454a8221bb98cb6a7241b4d4fc17840c6a.tar.xz nova-b5732a454a8221bb98cb6a7241b4d4fc17840c6a.zip | |
Catch NoValidHost exception during live-migration
To avoid leaving the instance state as MIGRATING if scheduling of
a target host fails, add this exception to the list of exceptions
for which the instance task state is reset to None.
Resolves bug 1166771.
Change-Id: I23343091725051624c0eb0b82e9f03a7f9d5f4f4
Diffstat (limited to 'nova/scheduler/manager.py')
| -rw-r--r-- | nova/scheduler/manager.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/scheduler/manager.py b/nova/scheduler/manager.py index 3124c6af9..c6e1ed390 100644 --- a/nova/scheduler/manager.py +++ b/nova/scheduler/manager.py @@ -94,7 +94,8 @@ class SchedulerManager(manager.Manager): return self.driver.schedule_live_migration( context, instance, dest, block_migration, disk_over_commit) - except (exception.ComputeServiceUnavailable, + except (exception.NoValidHost, + exception.ComputeServiceUnavailable, exception.InvalidHypervisorType, exception.UnableToMigrateToSelf, exception.DestinationHypervisorTooOld, |