Skip to content

Commit ea286d1

Browse files
committed
Prune tags and metadata during obj/version delete
1 parent 7dc892f commit ea286d1

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

app/src/controllers/object.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,8 +353,10 @@ const controller = {
353353
const objectVersionId = s3Response.VersionId;
354354
// delete version in DB
355355
await versionService.delete(objId, objectVersionId);
356+
// prune tags amd metadata
357+
await metadataService.pruneOrphanedMetadata();
358+
await tagService.pruneOrphanedTags();
356359
// if other versions in DB, delete object record
357-
// TODO: synch with versions in S3
358360
const remainingVersions = await versionService.list(objId);
359361
if (remainingVersions.length === 0) await objectService.delete(objId);
360362
} else { // else deleting the object
@@ -371,6 +373,9 @@ const controller = {
371373
} else { // else object in bucket is not versioned
372374
// delete object record from DB
373375
await objectService.delete(objId);
376+
// prune tags amd metadata
377+
await metadataService.pruneOrphanedMetadata();
378+
await tagService.pruneOrphanedTags();
374379
}
375380
}
376381

app/src/services/version.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ const service = {
111111
.returning('*')
112112
.throwIfNotFound();
113113

114-
// TODO: prune metadata and tags
115-
116114
if (!etrx) await trx.commit();
117115
return Promise.resolve(response);
118116
} catch (err) {

0 commit comments

Comments
 (0)