dstepanov-yadro/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#211] blobstor: Remove global lock

Browse source 
Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2020-11-25 14:30:48 +03:00 committed by Alex Vanin
parent 59f7cf9873
commit 53b114cf8b
5 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/local_object_storage/blobstor/blobstor.go
View file

@ -3,7 +3,6 @@ package blobstor
import ( import (
"encoding/hex" "encoding/hex"
"os" "os"
"sync"
"github.com/nspcc-dev/neofs-node/pkg/util/logger" "github.com/nspcc-dev/neofs-node/pkg/util/logger"
"go.uber.org/zap" "go.uber.org/zap"
@ -12,8 +11,6 @@ import (
// BlobStor represents NeoFS local BLOB storage. // BlobStor represents NeoFS local BLOB storage.
type BlobStor struct { type BlobStor struct {
*cfg *cfg
mtx *sync.RWMutex
} }
// Option represents BlobStor's constructor option. // Option represents BlobStor's constructor option.
@ -57,7 +54,6 @@ func New(opts ...Option) *BlobStor {
return &BlobStor{ return &BlobStor{
cfg: c, cfg: c,
mtx: new(sync.RWMutex),
} }
} }

3
pkg/local_object_storage/blobstor/delete_big.go
View file

@ -22,9 +22,6 @@ type DeleteBigRes struct{}
// //
// Returns ErrObjectNotFound if there is no object to delete. // Returns ErrObjectNotFound if there is no object to delete.
func (b *BlobStor) DeleteBig(prm *DeleteBigPrm) (*DeleteBigRes, error) { func (b *BlobStor) DeleteBig(prm *DeleteBigPrm) (*DeleteBigRes, error) {
b.mtx.Lock()
defer b.mtx.Unlock()
err := b.fsTree.delete(prm.addr) err := b.fsTree.delete(prm.addr)
if errors.Is(err, errFileNotFound) { if errors.Is(err, errFileNotFound) {
err = ErrObjectNotFound err = ErrObjectNotFound

3
pkg/local_object_storage/blobstor/get_big.go
View file

@ -27,9 +27,6 @@ var ErrObjectNotFound = errors.New("object not found")
// Returns any error encountered that // Returns any error encountered that
// did not allow to completely read the object. // did not allow to completely read the object.
func (b *BlobStor) GetBig(prm *GetBigPrm) (*GetBigRes, error) { func (b *BlobStor) GetBig(prm *GetBigPrm) (*GetBigRes, error) {
b.mtx.RLock()
defer b.mtx.RUnlock()
// get compressed object data // get compressed object data
data, err := b.fsTree.get(prm.addr) data, err := b.fsTree.get(prm.addr)
if err != nil { if err != nil {

3
pkg/local_object_storage/blobstor/get_range_big.go
View file

@ -21,9 +21,6 @@ type GetRangeBigRes struct {
// Returns any error encountered that // Returns any error encountered that
// did not allow to completely read the object payload range. // did not allow to completely read the object payload range.
func (b *BlobStor) GetRangeBig(prm *GetRangeBigPrm) (*GetRangeBigRes, error) { func (b *BlobStor) GetRangeBig(prm *GetRangeBigPrm) (*GetRangeBigRes, error) {
b.mtx.RLock()
defer b.mtx.RUnlock()
// get compressed object data // get compressed object data
data, err := b.fsTree.get(prm.addr) data, err := b.fsTree.get(prm.addr)
if err != nil { if err != nil {

3
pkg/local_object_storage/blobstor/put.go
View file

@ -28,9 +28,6 @@ type PutRes struct {
// Returns any error encountered that // Returns any error encountered that
// did not allow to completely save the object. // did not allow to completely save the object.
func (b *BlobStor) Put(prm *PutPrm) (*PutRes, error) { func (b *BlobStor) Put(prm *PutPrm) (*PutRes, error) {
b.mtx.Lock()
defer b.mtx.Unlock()
// marshal object // marshal object
data, err := prm.obj.Marshal() data, err := prm.obj.Marshal()
if err != nil { if err != nil {