|
@@ -19,13 +19,16 @@ def apply_retention(job, new_archive_name, backup_dir):
|
|
|
|
|
|
|
|
from jobs.utils import sudo_rm
|
|
from jobs.utils import sudo_rm
|
|
|
deleted = []
|
|
deleted = []
|
|
|
|
|
+ failed = []
|
|
|
for archive_filename in to_delete:
|
|
for archive_filename in to_delete:
|
|
|
base = os.path.splitext(archive_filename)[0]
|
|
base = os.path.splitext(archive_filename)[0]
|
|
|
- for ext in (".tar", ".info.json"):
|
|
|
|
|
- full = os.path.join(backup_dir, base + ext)
|
|
|
|
|
- sudo_rm(full)
|
|
|
|
|
- deleted.append(base + ext)
|
|
|
|
|
- return deleted
|
|
|
|
|
|
|
+ tar_path = os.path.join(backup_dir, base + ".tar")
|
|
|
|
|
+ if sudo_rm(tar_path):
|
|
|
|
|
+ deleted.append(archive_filename)
|
|
|
|
|
+ sudo_rm(os.path.join(backup_dir, base + ".info.json"))
|
|
|
|
|
+ else:
|
|
|
|
|
+ failed.append(archive_filename)
|
|
|
|
|
+ return deleted, failed
|
|
|
|
|
|
|
|
|
|
|
|
|
def _job_archive_prefix(job, instance_name):
|
|
def _job_archive_prefix(job, instance_name):
|