Revert "[backport] Prevent failed lease update from setting lease sta…

…tus to ERROR"

This reverts commit d78c38a.

Change-Id: Ia80e00a1aac3ad0c02a5062e997447fe243bacc6

blazar/exceptions.py

@@ -93,7 +93,6 @@ class Timeout(BlazarException):
 
 class InvalidInput(BlazarException):
     code = 400
-    restore_lease_status = True
     msg_fmt = _("Expected a %(cls)s type but received %(value)s.")
 
 

blazar/manager/exceptions.py

@@ -87,7 +87,6 @@ class EventError(exceptions.BlazarException):
 
 class InvalidDate(exceptions.BlazarException):
     code = 400
-    restore_lease_status = True
     msg_fmt = _(
         '%(date)s is an invalid date. Required format: %(date_format)s')
 
@@ -145,7 +144,7 @@ class HypervisorNotFound(exceptions.BlazarException):
 
 
 class NotEnoughResourcesAvailable(exceptions.BlazarException):
-    restore_lease_status = True
+    pass
 
 
 class NotEnoughHostsAvailable(NotEnoughResourcesAvailable):
@@ -159,19 +158,16 @@ class NotEnoughResourcesDefaultProperties(exceptions.BlazarException):
 
 class MalformedParameter(exceptions.BlazarException):
     code = 400
-    restore_lease_status = True
     msg_fmt = _("Malformed parameter %(param)s")
 
 
 class MalformedRequirements(exceptions.BlazarException):
     code = 400
-    restore_lease_status = True
     msg_fmt = _("Malformed requirements %(rqrms)s")
 
 
 class MissingParameter(exceptions.BlazarException):
     code = 400
-    restore_lease_status = True
     msg_fmt = _("Missing parameter %(param)s")
 
 
@@ -195,7 +191,6 @@ class ProjectIdNotFound(exceptions.BlazarException):
 
 class InvalidRange(exceptions.BlazarException):
     code = 400
-    restore_lease_status = True
     msg_fmt = _('Invalid values for min/max of hosts. '
                 'Max must be equal to or larger than min.')
 

blazar/status.py

@@ -202,58 +202,46 @@ def wrapper(*args, **kwargs):
                 else:
                     lease_id = args[1]
                 lease = db_api.lease_get(lease_id)
-                original_status = lease['status']
-                if cls.is_valid_transition(original_status,
+                if cls.is_valid_transition(lease['status'],
                                            transition,
                                            lease_id=lease_id):
                     db_api.lease_update(lease_id,
                                         {'status': transition})
                     LOG.debug('Status of lease %s changed from %s to %s.',
-                              lease_id, original_status, transition)
+                              lease_id, lease['status'], transition)
                 else:
                     LOG.warn('Aborting %s. '
                              'Invalid lease status transition from %s to %s.',
-                             func.__name__, original_status,
+                             func.__name__, lease['status'],
                              transition)
                     raise exceptions.InvalidStatus
 
                 # Executing the wrapped function
                 try:
                     result = func(*args, **kwargs)
                 except Exception as e:
-                    with save_and_reraise_exception():
-                        restore_lease_status = getattr(
-                            e, 'restore_lease_status', False)
-                        if restore_lease_status:
-                            LOG.debug('Non-fatal exception occured during '
-                                      'status transition, reverting status of '
-                                      'lease %s to %s.', lease_id,
-                                      original_status)
-                            db_api.lease_update(lease_id,
-                                                {'status': original_status})
-                        else:
-                            LOG.exception('Lease %s went into ERROR status.',
-                                          lease_id)
-                            db_api.lease_update(lease_id,
-                                                {'status': cls.ERROR})
-                else:
-                    # Update a lease status if it exists
-                    if db_api.lease_get(lease_id):
-                        next_status = cls.derive_stable_status(lease_id)
-                        if (next_status in result_in and
-                                cls.is_valid_transition(transition,
+                    LOG.exception('Lease %s went into ERROR status. %s',
+                                  lease_id, str(e))
+                    db_api.lease_update(lease_id,
+                                        {'status': cls.ERROR})
+                    raise e
+
+                # Update a lease status if it exists
+                if db_api.lease_get(lease_id):
+                    next_status = cls.derive_stable_status(lease_id)
+                    if (next_status in result_in
+                            and cls.is_valid_transition(transition,
                                                         next_status,
                                                         lease_id=lease_id)):
-                            db_api.lease_update(lease_id,
-                                                {'status': next_status})
-                            LOG.debug('Status of lease %s changed from %s to '
-                                      '%s.', lease_id, transition, next_status)
-                        else:
-                            LOG.error('Lease %s went into ERROR status.',
-                                      lease_id)
-                            db_api.lease_update(lease_id,
-                                                {'status': cls.ERROR})
-                            raise exceptions.InvalidStatus
+                        db_api.lease_update(lease_id,
+                                            {'status': next_status})
+                        LOG.debug('Status of lease %s changed from %s to %s.',
+                                  lease_id, transition, next_status)
+                    else:
+                        LOG.error('Lease %s went into ERROR status.',
+                                  lease_id)
+                        db_api.lease_update(lease_id, {'status': cls.ERROR})
+                        raise exceptions.InvalidStatus
 
                 return result
             return wrapper