From f5fa0224686c259188e6b85115fa16939c20cb29 Mon Sep 17 00:00:00 2001 From: Andrew Laski Date: Fri, 15 Mar 2013 13:48:55 -0400 Subject: Reset migrating task state for more Exceptions There are a number of exceptions that can occur during pre live-migration checks, and they should reset the task state to None when they occur since they prevent the migration from beginning. This adds two more exceptions to the list of exceptions that just need to reset the task state rather than set the instance to error. Bug 1100462 Change-Id: I95e09f49908fbc3a79f5d2eb490d5a0b3296a6ed --- nova/scheduler/manager.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'nova/scheduler/manager.py') diff --git a/nova/scheduler/manager.py b/nova/scheduler/manager.py index 87b0a39c6..3124c6af9 100644 --- a/nova/scheduler/manager.py +++ b/nova/scheduler/manager.py @@ -97,7 +97,9 @@ class SchedulerManager(manager.Manager): except (exception.ComputeServiceUnavailable, exception.InvalidHypervisorType, exception.UnableToMigrateToSelf, - exception.DestinationHypervisorTooOld) as ex: + exception.DestinationHypervisorTooOld, + exception.InvalidLocalStorage, + exception.InvalidSharedStorage) as ex: request_spec = {'instance_properties': { 'uuid': instance['uuid'], }, } -- cgit