Improve database is_being_used, checking current task error

Author: otherpirate

dbaas/logical/models.py

@@ -510,8 +510,15 @@ def get_cloudstack_service_offering_id(self):
 
     offering_id = property(get_cloudstack_service_offering_id)
 
-    def is_being_used_elsewhere(self):
-        return self.current_task
+    def is_being_used_elsewhere(self, skip_task_name=None):
+        if not self.current_task:
+            return False
+
+        if self.current_task.task_name == skip_task_name:
+            if self.current_task.is_status_error:
+                return False
+
+        return True
 
     def has_flipperfox_migration_started(self,):
         from flipperfox_migration.models import DatabaseFlipperFoxMigrationDetail
@@ -665,9 +672,9 @@ def can_do_upgrade_retry(self):
             error = "MongoDB 2.4 cannot be upgraded by this task."
         elif self.is_in_quarantine:
             error = "Database in quarantine and cannot be upgraded."
-        elif self.is_being_used_elsewhere():
-            error = "Database cannot be upgraded because" \
-                    " it is in use by another task."
+        elif self.is_being_used_elsewhere('notification.tasks.upgrade_database'):
+            error = "Database cannot be upgraded because " \
+                    "it is in use by another task."
         elif self.has_flipperfox_migration_started():
             error = "Database is being migrated and cannot be upgraded."
         elif not self.infra.plan.engine_equivalent_plan:
@@ -696,11 +703,9 @@ def can_do_resize_retry(self):
             error = "Database is being migrated and cannot be resized."
         elif not self.has_cloudstack_offerings:
             error = "There is no offerings for this database."
-        elif self.is_being_used_elsewhere():
-            task_name = self.current_task.task_name
-            if not task_name == "notification.tasks.resize_database":
-                error = "Database cannot be resized because" \
-                        " it is in use by another task."
+        elif self.is_being_used_elsewhere('notification.tasks.resize_database'):
+            error = "Database cannot be resized because" \
+                    " it is in use by another task."
         if error:
             return False, error
         return True, None

dbaas/notification/models.py

@@ -155,3 +155,7 @@ def waiting_tasks(cls):
     @property
     def is_running(self):
         return self.task_status == self.STATUS_RUNNING
+
+    @property
+    def is_status_error(self):
+        return self.task_status == self.STATUS_ERROR

dbaas/notification/tests/test_task_history.py

@@ -69,3 +69,11 @@ def test_is_running(self):
     def test_is_not_running(self):
         self.task.task_status = TaskHistory.STATUS_SUCCESS
         self.assertFalse(self.task.is_running)
+
+    def test_is_error(self):
+        self.task.task_status = TaskHistory.STATUS_ERROR
+        self.assertTrue(self.task.is_status_error)
+
+    def test_is_not_error(self):
+        self.task.task_status = TaskHistory.STATUS_SUCCESS
+        self.assertFalse(self.task.is_status_error)