diff --git a/api/layer/object.go b/api/layer/object.go index a96e07eb..f7d1585a 100644 --- a/api/layer/object.go +++ b/api/layer/object.go @@ -255,7 +255,7 @@ func (n *layer) PutObject(ctx context.Context, p *PutObjectParams) (*data.Object } if p.Lock != nil && (p.Lock.Retention != nil || p.Lock.LegalHold != nil) { - prm := &PutLockInfoParams{ + putLockInfoPrms := &PutLockInfoParams{ ObjVersion: &ObjectVersion{ BktInfo: p.BktInfo, ObjectName: p.Object, @@ -263,9 +263,10 @@ func (n *layer) PutObject(ctx context.Context, p *PutObjectParams) (*data.Object }, NewLock: p.Lock, CopiesNumber: p.CopiesNumber, + NodeVersion: newVersion, // provide new version to make one less tree service call in PutLockInfo } - if err = n.PutLockInfo(ctx, prm); err != nil { + if err = n.PutLockInfo(ctx, putLockInfoPrms); err != nil { return nil, err } } diff --git a/api/layer/system_object.go b/api/layer/system_object.go index 019397a4..3c1068ed 100644 --- a/api/layer/system_object.go +++ b/api/layer/system_object.go @@ -23,16 +23,23 @@ type PutLockInfoParams struct { ObjVersion *ObjectVersion NewLock *data.ObjectLock CopiesNumber uint32 + NodeVersion *data.NodeVersion // optional } -func (n *layer) PutLockInfo(ctx context.Context, p *PutLockInfoParams) error { +func (n *layer) PutLockInfo(ctx context.Context, p *PutLockInfoParams) (err error) { var ( cnrID = p.ObjVersion.BktInfo.CID newLock = p.NewLock ) - versionNode, err := n.getNodeVersion(ctx, p.ObjVersion) - if err != nil { - return err + + versionNode := p.NodeVersion + // sometimes node version can be provided from executing context + // if value is not provided, make a tree service call + if versionNode == nil { + versionNode, err = n.getNodeVersion(ctx, p.ObjVersion) + if err != nil { + return err + } } lockInfo, err := n.treeService.GetLock(ctx, cnrID, versionNode.ID)