Skip to content

Commit 581ea51

Browse files
committed
Creating method to set error in task in lock problem
1 parent e64530a commit 581ea51

File tree

3 files changed

+11
-16
lines changed

3 files changed

+11
-16
lines changed

dbaas/notification/models.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,3 +159,11 @@ def is_running(self):
159159
@property
160160
def is_status_error(self):
161161
return self.task_status == self.STATUS_ERROR
162+
163+
def error_in_lock(self, database):
164+
self.add_detail("FAILED!")
165+
self.add_detail("Database {} is not allocated for this task.".format(
166+
database.name
167+
))
168+
self.task_status = self.STATUS_ERROR
169+
self.save()

dbaas/notification/tasks.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -627,10 +627,7 @@ def database_disk_resize(self, database, disk_offering, task_history, user):
627627
AuditRequest.new_request("database_disk_resize", user, "localhost")
628628

629629
if not database.pin_task(task_history):
630-
task_history.update_details("FAILED!", persist=True)
631-
task_history.add_detail(
632-
"Database {} is not allocated for this task.".format(db.name)
633-
)
630+
task_history.error_in_lock(database)
634631
return False
635632

636633
databaseinfra = database.databaseinfra

dbaas/workflow/workflow.py

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,7 @@ def _lock_databases(params, task):
3939
databases_pinned = []
4040
for database in databases:
4141
if not database.pin_task(task):
42-
task.update_details("FAILED!", persist=True)
43-
task.add_detail(
44-
"Database {} is not allocated for this task.".format(
45-
database.name
46-
)
47-
)
42+
task.error_in_lock(database)
4843
for database in databases_pinned:
4944
database.unpin_task()
5045
return False
@@ -267,12 +262,7 @@ def steps_for_instances(
267262
for database in databases:
268263
databases_locked = []
269264
if not database.update_task(task):
270-
task.update_details("FAILED!", persist=True)
271-
task.add_detail(
272-
"Database {} is not allocated for this task.".format(
273-
database.name
274-
)
275-
)
265+
task.error_in_lock(database)
276266

277267
if since_step == 0:
278268
for database in databases_locked:

0 commit comments

Comments
 (0)