Skip to content

Commit

Permalink
[#368] Unify cache value deletion
Browse files Browse the repository at this point in the history
Signed-off-by: Denis Kirillov <[email protected]>
  • Loading branch information
KirillovDenis committed Mar 16, 2022
1 parent e7b742d commit 02f4524
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion api/layer/layer.go
Original file line number Diff line number Diff line change
Expand Up @@ -890,9 +890,9 @@ func (n *layer) DeleteBucket(ctx context.Context, p *DeleteBucketParams) error {
return errors.GetAPIError(errors.ErrBucketNotEmpty)
}

n.bucketCache.Delete(bucketInfo.Name)
if err = n.deleteContainer(ctx, bucketInfo.CID); err != nil {
return err
}
n.bucketCache.Delete(bucketInfo.Name)
return nil
}
10 changes: 5 additions & 5 deletions api/layer/object.go
Original file line number Diff line number Diff line change
Expand Up @@ -189,17 +189,17 @@ func (n *layer) objectPut(ctx context.Context, bkt *data.BucketInfo, p *PutObjec

n.prepareAuthParameters(ctx, &prm.PrmAuth)

id, err := n.neoFS.CreateObject(ctx, prm)
if err != nil {
return nil, n.transformNeofsError(ctx, err)
}

if p.Header[VersionsDeleteMarkAttr] == DelMarkFullObject {
if last := versions.getLast(); last != nil {
n.objCache.Delete(last.Address())
}
}

id, err := n.neoFS.CreateObject(ctx, prm)
if err != nil {
return nil, n.transformNeofsError(ctx, err)
}

meta, err := n.objectHead(ctx, bkt.CID, id)
if err != nil {
return nil, err
Expand Down
2 changes: 1 addition & 1 deletion api/layer/system_object.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ func (n *layer) deleteSystemObject(ctx context.Context, bktInfo *data.BucketInfo
return err
}

n.systemCache.Delete(systemObjectKey(bktInfo, name))
for i := range ids {
if err = n.objectDelete(ctx, bktInfo.CID, &ids[i]); err != nil {
return err
}
}

n.systemCache.Delete(systemObjectKey(bktInfo, name))
return nil
}

Expand Down

0 comments on commit 02f4524

Please sign in to comment.