Avoid force delete of backup
Some drivers in cinder does not support force delete.
As current Staffeln is able to support both soft and hard delete,
let's avoid hard delete (force delete) in this case.
diff --git a/staffeln/conductor/backup.py b/staffeln/conductor/backup.py
index 8df0f57..895ca7b 100755
--- a/staffeln/conductor/backup.py
+++ b/staffeln/conductor/backup.py
@@ -217,7 +217,7 @@
backup = self.openstacksdk.get_backup(task.backup_id)
if backup is None:
return task.delete_queue()
- self.openstacksdk.delete_backup(task.backup_id, force=True)
+ self.openstacksdk.delete_backup(task.backup_id)
self.create_failed_backup_obj(task)
task.reason = reason
@@ -307,7 +307,7 @@
)
return backup_object.delete_backup()
- self.openstacksdk.delete_backup(uuid=backup_object.backup_id, force=True)
+ self.openstacksdk.delete_backup(uuid=backup_object.backup_id)
# Don't remove backup until it's officially removed from Cinder
# backup_object.delete_backup()
except Exception as e:
@@ -316,7 +316,7 @@
else:
LOG.info(
_(
- f"Backup {backup_object.backup_id} deletion failed."
+ f"Backup {backup_object.backup_id} deletion failed. "
"Skip this backup from remove now and will retry later."
)
)
@@ -632,7 +632,7 @@
LOG.warn(reason)
# 2. delete backup generator
try:
- self.openstacksdk.delete_backup(uuid=task.backup_id, force=True)
+ self.openstacksdk.delete_backup(uuid=task.backup_id)
self.create_failed_backup_obj(task)
except OpenstackHttpException as ex:
LOG.warn(