EliChin/frostfs-s3-gw
1
0
Fork 0
forked from TrueCloudLab/frostfs-s3-gw
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#513] Don't remove delete mark object

Browse source 
Signed-off-by: Denis Kirillov <denis@nspcc.ru>
This commit is contained in:
Denis Kirillov 2022-06-07 11:54:42 +03:00 committed by Alex Vanin
parent 41c815441b
commit 59570ac075
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
api/layer/layer.go
View file

@ -531,11 +531,10 @@ func (n *layer) removeVersionIfFound(ctx context.Context, bkt *data.BucketInfo,
var deleteMarkVersion string var deleteMarkVersion string
if version.DeleteMarker != nil { if version.DeleteMarker != nil {
deleteMarkVersion = obj.VersionID deleteMarkVersion = obj.VersionID
} } else if err := n.objectDelete(ctx, bkt, version.OID); err != nil {
if err := n.objectDelete(ctx, bkt, version.OID); err != nil {
return deleteMarkVersion, err return deleteMarkVersion, err
} }
return deleteMarkVersion, n.treeService.RemoveVersion(ctx, &bkt.CID, version.ID) return deleteMarkVersion, n.treeService.RemoveVersion(ctx, &bkt.CID, version.ID)
} }