Sfoglia il codice sorgente

Added proper Exception raising in OpenStack provders when instance errors during deletion.

Nashwan Azhari 9 anni fa
parent
commit
3e91acf7a4
1 ha cambiato i file con 3 aggiunte e 1 eliminazioni
  1. 3 1
      coriolis/providers/openstack/common.py

+ 3 - 1
coriolis/providers/openstack/common.py

@@ -116,7 +116,9 @@ def wait_for_instance_deletion(nova, instance_id, timeout=300, period=2):
     while time.time() < endtime and instances:
     while time.time() < endtime and instances:
         instance = utils.index_singleton_list(instances)
         instance = utils.index_singleton_list(instances)
         if instance.status == SERVER_STATUS_ERROR:
         if instance.status == SERVER_STATUS_ERROR:
-            break
+            raise exception.CoriolisException(
+                "Instance \"%s\" has reached invalid state \"%s\" while "
+                "deleting." % (instance_id, instance.status))
 
 
         LOG.debug('Instance %(id)s status: %(status)s. '
         LOG.debug('Instance %(id)s status: %(status)s. '
                   'Waiting %(period)s seconds for its deletion.',
                   'Waiting %(period)s seconds for its deletion.',