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

[#1523] local_object_storage: Move blobovnicza tree to a separate package

Browse source 
Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2022-07-05 16:47:39 +03:00 committed by fyrchik
parent 5139dc9864
commit b621f5983a
30 changed files with 758 additions and 538 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

228
pkg/local_object_storage/blobstor/blobovnicza.go → pkg/local_object_storage/blobstor/blobovniczatree/blobovnicza.go
View file

@ -1,7 +1,6 @@
package blobstor
package blobovniczatree
import (
"bytes"
"errors"
"fmt"
"path/filepath"
@ -18,7 +17,7 @@ import (
"go.uber.org/zap"
)
// represents the storage of the "small" objects.
// Blobovniczas represents the storage of the "small" objects.
//
// Each object is stored in Blobovnicza's (B-s).
// B-s are structured in a multilevel directory hierarchy
@ -58,10 +57,10 @@ import (
//
// After the object is saved in B, path concatenation is returned
// in system path format as B identifier (ex. "0/1/1" or "3/2/1").
type blobovniczas struct {
*cfg
type Blobovniczas struct {
cfg
// cache of opened filled blobovniczas
// cache of opened filled Blobovniczas
opened *simplelru.LRU
// lruMtx protects opened cache.
// It isn't RWMutex because `Get` calls must
@ -74,7 +73,7 @@ type blobovniczas struct {
// bbolt.Open() deadlocks if it tries to open already opened file
openMtx sync.Mutex
// list of active (opened, non-filled) blobovniczas
// list of active (opened, non-filled) Blobovniczas
activeMtx sync.RWMutex
active map[string]blobovniczaWithIndex
@ -89,36 +88,43 @@ type blobovniczaWithIndex struct {
var errPutFailed = errors.New("could not save the object in any blobovnicza")
func newBlobovniczaTree(c *cfg) (blz *blobovniczas) {
cache, err := simplelru.NewLRU(c.openedCacheSize, func(key interface{}, value interface{}) {
// NewBlobovniczaTree returns new instance of blobovnizas tree.
func NewBlobovniczaTree(opts ...Option) (blz *Blobovniczas) {
blz = new(Blobovniczas)
initConfig(&blz.cfg)
for i := range opts {
opts[i](&blz.cfg)
}
cache, err := simplelru.NewLRU(blz.openedCacheSize, func(key interface{}, value interface{}) {
if _, ok := blz.active[filepath.Dir(key.(string))]; ok {
return
} else if err := value.(*blobovnicza.Blobovnicza).Close(); err != nil {
c.log.Error("could not close Blobovnicza",
blz.log.Error("could not close Blobovnicza",
zap.String("id", key.(string)),
zap.String("error", err.Error()),
)
} else {
c.log.Debug("blobovnicza successfully closed on evict",
blz.log.Debug("blobovnicza successfully closed on evict",
zap.String("id", key.(string)),
)
}
})
if err != nil {
// occurs only if the size is not positive
panic(fmt.Errorf("could not create LRU cache of size %d: %w", c.openedCacheSize, err))
panic(fmt.Errorf("could not create LRU cache of size %d: %w", blz.openedCacheSize, err))
}
cp := uint64(1)
for i := uint64(0); i < c.blzShallowDepth; i++ {
cp *= c.blzShallowWidth
for i := uint64(0); i < blz.blzShallowDepth; i++ {
cp *= blz.blzShallowWidth
}
return &blobovniczas{
cfg: c,
opened: cache,
active: make(map[string]blobovniczaWithIndex, cp),
}
blz.opened = cache
blz.active = make(map[string]blobovniczaWithIndex, cp)
return blz
}
// makes slice of uint64 values from 0 to number-1.
@ -135,7 +141,7 @@ func indexSlice(number uint64) []uint64 {
// save object in the maximum weight blobobnicza.
//
// returns error if could not save object in any blobovnicza.
func (b *blobovniczas) put(addr oid.Address, data []byte) (*blobovnicza.ID, error) {
func (b *Blobovniczas) Put(addr oid.Address, data []byte) (*blobovnicza.ID, error) {
var prm blobovnicza.PutPrm
prm.SetAddress(addr)
prm.SetMarshaledObject(data)
@ -186,7 +192,7 @@ func (b *blobovniczas) put(addr oid.Address, data []byte) (*blobovnicza.ID, erro
id = blobovnicza.NewIDFromBytes([]byte(p))
storagelog.Write(b.log, storagelog.AddressField(addr), storagelog.OpField("blobovniczas PUT"))
storagelog.Write(b.log, storagelog.AddressField(addr), storagelog.OpField("Blobovniczas PUT"))
return true, nil
}
@ -203,8 +209,8 @@ func (b *blobovniczas) put(addr oid.Address, data []byte) (*blobovnicza.ID, erro
// reads object from blobovnicza tree.
//
// If blobocvnicza ID is specified, only this blobovnicza is processed.
// Otherwise, all blobovniczas are processed descending weight.
func (b *blobovniczas) get(prm GetSmallPrm) (res GetSmallRes, err error) {
// Otherwise, all Blobovniczas are processed descending weight.
func (b *Blobovniczas) Get(prm GetSmallPrm) (res GetSmallRes, err error) {
var bPrm blobovnicza.GetPrm
bPrm.SetAddress(prm.addr)
@ -236,7 +242,7 @@ func (b *blobovniczas) get(prm GetSmallPrm) (res GetSmallRes, err error) {
activeCache[dirPath] = struct{}{}
// abort iterator if found, otherwise process all blobovniczas
// abort iterator if found, otherwise process all Blobovniczas
return err == nil, nil
})
@ -250,11 +256,11 @@ func (b *blobovniczas) get(prm GetSmallPrm) (res GetSmallRes, err error) {
return
}
// removes object from blobovnicza tree.
// Delete deletes object from blobovnicza tree.
//
// If blobocvnicza ID is specified, only this blobovnicza is processed.
// Otherwise, all blobovniczas are processed descending weight.
func (b *blobovniczas) delete(prm DeleteSmallPrm) (res DeleteSmallRes, err error) {
// Otherwise, all Blobovniczas are processed descending weight.
func (b *Blobovniczas) Delete(prm DeleteSmallPrm) (res DeleteSmallRes, err error) {
var bPrm blobovnicza.DeletePrm
bPrm.SetAddress(prm.addr)
@ -292,7 +298,7 @@ func (b *blobovniczas) delete(prm DeleteSmallPrm) (res DeleteSmallRes, err error
objectFound = true
}
// abort iterator if found, otherwise process all blobovniczas
// abort iterator if found, otherwise process all Blobovniczas
return err == nil, nil
})
@ -306,11 +312,11 @@ func (b *blobovniczas) delete(prm DeleteSmallPrm) (res DeleteSmallRes, err error
return
}
// reads range of object payload data from blobovnicza tree.
// GetRange reads range of object payload data from blobovnicza tree.
//
// If blobocvnicza ID is specified, only this blobovnicza is processed.
// Otherwise, all blobovniczas are processed descending weight.
func (b *blobovniczas) getRange(prm GetRangeSmallPrm) (res GetRangeSmallRes, err error) {
// Otherwise, all Blobovniczas are processed descending weight.
func (b *Blobovniczas) GetRange(prm GetRangeSmallPrm) (res GetRangeSmallRes, err error) {
if prm.blobovniczaID != nil {
blz, err := b.openBlobovnicza(prm.blobovniczaID.String())
if err != nil {
@ -346,7 +352,7 @@ func (b *blobovniczas) getRange(prm GetRangeSmallPrm) (res GetRangeSmallRes, err
objectFound = err == nil
// abort iterator if found, otherwise process all blobovniczas
// abort iterator if found, otherwise process all Blobovniczas
return err == nil, nil
})
@ -363,7 +369,7 @@ func (b *blobovniczas) getRange(prm GetRangeSmallPrm) (res GetRangeSmallRes, err
// tries to delete object from particular blobovnicza.
//
// returns no error if object was removed from some blobovnicza of the same level.
func (b *blobovniczas) deleteObjectFromLevel(prm blobovnicza.DeletePrm, blzPath string, tryActive bool, dp DeleteSmallPrm) (DeleteSmallRes, error) {
func (b *Blobovniczas) deleteObjectFromLevel(prm blobovnicza.DeletePrm, blzPath string, tryActive bool, dp DeleteSmallPrm) (DeleteSmallRes, error) {
lvlPath := filepath.Dir(blzPath)
// try to remove from blobovnicza if it is opened
@ -403,7 +409,7 @@ func (b *blobovniczas) deleteObjectFromLevel(prm blobovnicza.DeletePrm, blzPath
// then object is possibly placed in closed blobovnicza
// check if it makes sense to try to open the blob
// (blobovniczas "after" the active one are empty anyway,
// (Blobovniczas "after" the active one are empty anyway,
// and it's pointless to open them).
if u64FromHexString(filepath.Base(blzPath)) > active.ind {
b.log.Debug("index is too big", zap.String("path", blzPath))
@ -424,7 +430,7 @@ func (b *blobovniczas) deleteObjectFromLevel(prm blobovnicza.DeletePrm, blzPath
// tries to read object from particular blobovnicza.
//
// returns error if object could not be read from any blobovnicza of the same level.
func (b *blobovniczas) getObjectFromLevel(prm blobovnicza.GetPrm, blzPath string, tryActive bool) (GetSmallRes, error) {
func (b *Blobovniczas) getObjectFromLevel(prm blobovnicza.GetPrm, blzPath string, tryActive bool) (GetSmallRes, error) {
lvlPath := filepath.Dir(blzPath)
// try to read from blobovnicza if it is opened
@ -465,7 +471,7 @@ func (b *blobovniczas) getObjectFromLevel(prm blobovnicza.GetPrm, blzPath string
// then object is possibly placed in closed blobovnicza
// check if it makes sense to try to open the blob
// (blobovniczas "after" the active one are empty anyway,
// (Blobovniczas "after" the active one are empty anyway,
// and it's pointless to open them).
if u64FromHexString(filepath.Base(blzPath)) > active.ind {
b.log.Debug("index is too big", zap.String("path", blzPath))
@ -486,7 +492,7 @@ func (b *blobovniczas) getObjectFromLevel(prm blobovnicza.GetPrm, blzPath string
// tries to read range of object payload data from particular blobovnicza.
//
// returns error if object could not be read from any blobovnicza of the same level.
func (b *blobovniczas) getRangeFromLevel(prm GetRangeSmallPrm, blzPath string, tryActive bool) (GetRangeSmallRes, error) {
func (b *Blobovniczas) getRangeFromLevel(prm GetRangeSmallPrm, blzPath string, tryActive bool) (GetRangeSmallRes, error) {
lvlPath := filepath.Dir(blzPath)
// try to read from blobovnicza if it is opened
@ -537,7 +543,7 @@ func (b *blobovniczas) getRangeFromLevel(prm GetRangeSmallPrm, blzPath string, t
// then object is possibly placed in closed blobovnicza
// check if it makes sense to try to open the blob
// (blobovniczas "after" the active one are empty anyway,
// (Blobovniczas "after" the active one are empty anyway,
// and it's pointless to open them).
if u64FromHexString(filepath.Base(blzPath)) > active.ind {
b.log.Debug("index is too big", zap.String("path", blzPath))
@ -557,7 +563,7 @@ func (b *blobovniczas) getRangeFromLevel(prm GetRangeSmallPrm, blzPath string, t
}
// removes object from blobovnicza and returns DeleteSmallRes.
func (b *blobovniczas) deleteObject(blz *blobovnicza.Blobovnicza, prm blobovnicza.DeletePrm, dp DeleteSmallPrm) (DeleteSmallRes, error) {
func (b *Blobovniczas) deleteObject(blz *blobovnicza.Blobovnicza, prm blobovnicza.DeletePrm, dp DeleteSmallPrm) (DeleteSmallRes, error) {
_, err := blz.Delete(prm)
if err != nil {
return DeleteSmallRes{}, err
@ -565,7 +571,7 @@ func (b *blobovniczas) deleteObject(blz *blobovnicza.Blobovnicza, prm blobovnicz
storagelog.Write(b.log,
storagelog.AddressField(dp.addr),
storagelog.OpField("blobovniczas DELETE"),
storagelog.OpField("Blobovniczas DELETE"),
zap.Stringer("blobovnicza ID", dp.blobovniczaID),
)
@ -573,14 +579,14 @@ func (b *blobovniczas) deleteObject(blz *blobovnicza.Blobovnicza, prm blobovnicz
}
// reads object from blobovnicza and returns GetSmallRes.
func (b *blobovniczas) getObject(blz *blobovnicza.Blobovnicza, prm blobovnicza.GetPrm) (GetSmallRes, error) {
func (b *Blobovniczas) getObject(blz *blobovnicza.Blobovnicza, prm blobovnicza.GetPrm) (GetSmallRes, error) {
res, err := blz.Get(prm)
if err != nil {
return GetSmallRes{}, err
}
// decompress the data
data, err := b.decompressor(res.Object())
data, err := b.Decompress(res.Object())
if err != nil {
return GetSmallRes{}, fmt.Errorf("could not decompress object data: %w", err)
}
@ -592,14 +598,12 @@ func (b *blobovniczas) getObject(blz *blobovnicza.Blobovnicza, prm blobovnicza.G
}
return GetSmallRes{
roObject: roObject{
obj: obj,
},
obj: obj,
}, nil
}
// reads range of object payload data from blobovnicza and returns GetRangeSmallRes.
func (b *blobovniczas) getObjectRange(blz *blobovnicza.Blobovnicza, prm GetRangeSmallPrm) (GetRangeSmallRes, error) {
func (b *Blobovniczas) getObjectRange(blz *blobovnicza.Blobovnicza, prm GetRangeSmallPrm) (GetRangeSmallRes, error) {
var gPrm blobovnicza.GetPrm
gPrm.SetAddress(prm.addr)
@ -613,7 +617,7 @@ func (b *blobovniczas) getObjectRange(blz *blobovnicza.Blobovnicza, prm GetRange
}
// decompress the data
data, err := b.decompressor(res.Object())
data, err := b.Decompress(res.Object())
if err != nil {
return GetRangeSmallRes{}, fmt.Errorf("could not decompress object data: %w", err)
}
@ -635,19 +639,19 @@ func (b *blobovniczas) getObjectRange(blz *blobovnicza.Blobovnicza, prm GetRange
}
return GetRangeSmallRes{
rangeData: rangeData{
rangeData{
data: payload[from:to],
},
}, nil
}
// iterator over the paths of blobovniczas in random order.
func (b *blobovniczas) iterateLeaves(f func(string) (bool, error)) error {
// iterator over the paths of Blobovniczas in random order.
func (b *Blobovniczas) iterateLeaves(f func(string) (bool, error)) error {
return b.iterateSortedLeaves(nil, f)
}
// iterator over all blobovniczas in unsorted order. Break on f's error return.
func (b *blobovniczas) iterateBlobovniczas(ignoreErrors bool, f func(string, *blobovnicza.Blobovnicza) error) error {
// iterator over all Blobovniczas in unsorted order. Break on f's error return.
func (b *Blobovniczas) Iterate(ignoreErrors bool, f func(string, *blobovnicza.Blobovnicza) error) error {
return b.iterateLeaves(func(p string) (bool, error) {
blz, err := b.openBlobovnicza(p)
if err != nil {
@ -663,8 +667,8 @@ func (b *blobovniczas) iterateBlobovniczas(ignoreErrors bool, f func(string, *bl
})
}
// iterator over the paths of blobovniczas sorted by weight.
func (b *blobovniczas) iterateSortedLeaves(addr *oid.Address, f func(string) (bool, error)) error {
// iterator over the paths of Blobovniczas sorted by weight.
func (b *Blobovniczas) iterateSortedLeaves(addr *oid.Address, f func(string) (bool, error)) error {
_, err := b.iterateSorted(
addr,
make([]string, 0, b.blzShallowDepth),
@ -675,8 +679,8 @@ func (b *blobovniczas) iterateSortedLeaves(addr *oid.Address, f func(string) (bo
return err
}
// iterator over directories with blobovniczas sorted by weight.
func (b *blobovniczas) iterateDeepest(addr oid.Address, f func(string) (bool, error)) error {
// iterator over directories with Blobovniczas sorted by weight.
func (b *Blobovniczas) iterateDeepest(addr oid.Address, f func(string) (bool, error)) error {
depth := b.blzShallowDepth
if depth > 0 {
depth--
@ -693,7 +697,7 @@ func (b *blobovniczas) iterateDeepest(addr oid.Address, f func(string) (bool, er
}
// iterator over particular level of directories.
func (b *blobovniczas) iterateSorted(addr *oid.Address, curPath []string, execDepth uint64, f func([]string) (bool, error)) (bool, error) {
func (b *Blobovniczas) iterateSorted(addr *oid.Address, curPath []string, execDepth uint64, f func([]string) (bool, error)) (bool, error) {
indices := indexSlice(b.blzShallowWidth)
hrw.SortSliceByValue(indices, addressHash(addr, filepath.Join(curPath...)))
@ -726,14 +730,14 @@ func (b *blobovniczas) iterateSorted(addr *oid.Address, curPath []string, execDe
// activates and returns activated blobovnicza of p-level (dir).
//
// returns error if blobvnicza could not be activated.
func (b *blobovniczas) getActivated(p string) (blobovniczaWithIndex, error) {
func (b *Blobovniczas) getActivated(p string) (blobovniczaWithIndex, error) {
return b.updateAndGet(p, nil)
}
// updates active blobovnicza of p-level (dir).
//
// if current active blobovnicza's index is not old, it remains unchanged.
func (b *blobovniczas) updateActive(p string, old *uint64) error {
func (b *Blobovniczas) updateActive(p string, old *uint64) error {
b.log.Debug("updating active blobovnicza...", zap.String("path", p))
_, err := b.updateAndGet(p, old)
@ -746,7 +750,7 @@ func (b *blobovniczas) updateActive(p string, old *uint64) error {
// updates and returns active blobovnicza of p-level (dir).
//
// if current active blobovnicza's index is not old, it is returned unchanged.
func (b *blobovniczas) updateAndGet(p string, old *uint64) (blobovniczaWithIndex, error) {
func (b *Blobovniczas) updateAndGet(p string, old *uint64) (blobovniczaWithIndex, error) {
b.activeMtx.RLock()
active, ok := b.active[p]
b.activeMtx.RUnlock()
@ -754,7 +758,7 @@ func (b *blobovniczas) updateAndGet(p string, old *uint64) (blobovniczaWithIndex
if ok {
if old != nil {
if active.ind == b.blzShallowWidth-1 {
return active, errors.New("no more blobovniczas")
return active, errors.New("no more Blobovniczas")
} else if active.ind != *old {
// sort of CAS in order to control concurrent
// updateActive calls
@ -793,108 +797,10 @@ func (b *blobovniczas) updateAndGet(p string, old *uint64) (blobovniczaWithIndex
return active, nil
}
// initializes blobovnicza tree.
//
// Should be called exactly once.
func (b *blobovniczas) init() error {
b.log.Debug("initializing Blobovnicza's")
enc, zstdC, err := zstdCompressor()
if err != nil {
return fmt.Errorf("could not create zstd compressor: %v", err)
}
b.onClose = append(b.onClose, func() {
if err := enc.Close(); err != nil {
b.log.Debug("can't close zstd compressor", zap.String("err", err.Error()))
}
})
dec, zstdD, err := zstdDecompressor()
if err != nil {
return fmt.Errorf("could not create zstd decompressor: %v", err)
}
b.onClose = append(b.onClose, dec.Close)
// Compression is always done based on config settings.
if b.compressionEnabled {
b.compressor = zstdC
} else {
b.compressor = noOpCompressor
}
// However we should be able to read any object
// we have previously written.
b.decompressor = func(data []byte) ([]byte, error) {
// Fallback to reading decompressed objects.
// For normal objects data is always bigger than 4 bytes, the first check is here
// because function interface is rather generic (Go compiler inserts bound
// checks anyway).
if len(data) < 4 || !bytes.Equal(data[:4], zstdFrameMagic) {
return noOpDecompressor(data)
}
return zstdD(data)
}
if b.readOnly {
b.log.Debug("read-only mode, skip blobovniczas initialization...")
return nil
}
return b.iterateBlobovniczas(false, func(p string, blz *blobovnicza.Blobovnicza) error {
if err := blz.Init(); err != nil {
return fmt.Errorf("could not initialize blobovnicza structure %s: %w", p, err)
}
b.log.Debug("blobovnicza successfully initialized, closing...", zap.String("id", p))
return nil
})
}
// closes blobovnicza tree.
func (b *blobovniczas) close() error {
b.activeMtx.Lock()
b.lruMtx.Lock()
for p, v := range b.active {
if err := v.blz.Close(); err != nil {
b.log.Debug("could not close active blobovnicza",
zap.String("path", p),
zap.String("error", err.Error()),
)
}
b.opened.Remove(p)
}
for _, k := range b.opened.Keys() {
v, _ := b.opened.Get(k)
blz := v.(*blobovnicza.Blobovnicza)
if err := blz.Close(); err != nil {
b.log.Debug("could not close active blobovnicza",
zap.String("path", k.(string)),
zap.String("error", err.Error()),
)
}
b.opened.Remove(k)
}
b.active = make(map[string]blobovniczaWithIndex)
b.lruMtx.Unlock()
b.activeMtx.Unlock()
for i := range b.onClose {
b.onClose[i]()
}
return nil
}
// opens and returns blobovnicza with path p.
//
// If blobovnicza is already opened and cached, instance from cache is returned w/o changes.
func (b *blobovniczas) openBlobovnicza(p string) (*blobovnicza.Blobovnicza, error) {
func (b *Blobovniczas) openBlobovnicza(p string) (*blobovnicza.Blobovnicza, error) {
b.lruMtx.Lock()
v, ok := b.opened.Get(p)
b.lruMtx.Unlock()
@ -916,7 +822,7 @@ func (b *blobovniczas) openBlobovnicza(p string) (*blobovnicza.Blobovnicza, erro
blz := blobovnicza.New(append(b.blzOpts,
blobovnicza.WithReadOnly(b.readOnly),
blobovnicza.WithPath(filepath.Join(b.blzRootPath, p)),
blobovnicza.WithPath(filepath.Join(b.rootPath, p)),
)...)
if err := blz.Open(); err != nil {

38
pkg/local_object_storage/blobstor/blobovnicza_test.go → pkg/local_object_storage/blobstor/blobovniczatree/blobovnicza_test.go
View file

@ -1,4 +1,4 @@
package blobstor
package blobovniczatree
import (
"math/rand"
@ -36,9 +36,8 @@ func TestBlobovniczas(t *testing.T) {
rand.Seed(1024)
l := test.NewLogger(false)
p := "./test_blz"
c := defaultCfg()
p, err := os.MkdirTemp("", "*")
require.NoError(t, err)
var width, depth uint64 = 2, 2
@ -46,24 +45,17 @@ func TestBlobovniczas(t *testing.T) {
// 32 KiB is the initial size after all by-size buckets are created.
var szLim uint64 = 32*1024 + 1
for _, opt := range []Option{
b := NewBlobovniczaTree(
WithLogger(l),
WithSmallSizeLimit(szLim),
WithObjectSizeLimit(szLim),
WithBlobovniczaShallowWidth(width),
WithBlobovniczaShallowDepth(depth),
WithRootPath(p),
WithBlobovniczaSize(szLim),
} {
opt(c)
}
c.blzRootPath = p
b := newBlobovniczaTree(c)
WithBlobovniczaSize(szLim))
defer os.RemoveAll(p)
require.NoError(t, b.init())
require.NoError(t, b.Init())
objSz := uint64(szLim / 2)
@ -80,7 +72,7 @@ func TestBlobovniczas(t *testing.T) {
require.NoError(t, err)
// save object in blobovnicza
id, err := b.put(addr, d)
id, err := b.Put(addr, d)
require.NoError(t, err, i)
// get w/ blobovnicza ID
@ -88,14 +80,14 @@ func TestBlobovniczas(t *testing.T) {
prm.SetBlobovniczaID(id)
prm.SetAddress(addr)
res, err := b.get(prm)
res, err := b.Get(prm)
require.NoError(t, err)
require.Equal(t, obj, res.Object())
// get w/o blobovnicza ID
prm.SetBlobovniczaID(nil)
res, err = b.get(prm)
res, err = b.Get(prm)
require.NoError(t, err)
require.Equal(t, obj, res.Object())
@ -114,14 +106,14 @@ func TestBlobovniczas(t *testing.T) {
rng.SetOffset(off)
rng.SetLength(ln)
rngRes, err := b.getRange(rngPrm)
rngRes, err := b.GetRange(rngPrm)
require.NoError(t, err)
require.Equal(t, payload[off:off+ln], rngRes.RangeData())
// get range w/o blobovnicza ID
rngPrm.SetBlobovniczaID(nil)
rngRes, err = b.getRange(rngPrm)
rngRes, err = b.GetRange(rngPrm)
require.NoError(t, err)
require.Equal(t, payload[off:off+ln], rngRes.RangeData())
}
@ -132,15 +124,15 @@ func TestBlobovniczas(t *testing.T) {
for i := range addrList {
dPrm.SetAddress(addrList[i])
_, err := b.delete(dPrm)
_, err := b.Delete(dPrm)
require.NoError(t, err)
gPrm.SetAddress(addrList[i])
_, err = b.get(gPrm)
_, err = b.Get(gPrm)
require.ErrorAs(t, err, new(apistatus.ObjectNotFound))
_, err = b.delete(dPrm)
_, err = b.Delete(dPrm)
require.ErrorAs(t, err, new(apistatus.ObjectNotFound))
}
}

79
pkg/local_object_storage/blobstor/blobovniczatree/common.go Normal file
View file

@ -0,0 +1,79 @@
package blobovniczatree
import (
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobovnicza"
"github.com/nspcc-dev/neofs-sdk-go/object"
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
)
type address struct {
addr oid.Address
}
// SetAddress sets the address of the requested object.
func (a *address) SetAddress(addr oid.Address) {
a.addr = addr
}
type roObject struct {
obj *object.Object
}
// Object returns the object.
func (o roObject) Object() *object.Object {
return o.obj
}
type rwObject struct {
roObject
}
// SetObject sets the object.
func (o *rwObject) SetObject(obj *object.Object) {
o.obj = obj
}
type roBlobovniczaID struct {
blobovniczaID *blobovnicza.ID
}
// BlobovniczaID returns blobovnicza ID.
func (v roBlobovniczaID) BlobovniczaID() *blobovnicza.ID {
return v.blobovniczaID
}
type rwBlobovniczaID struct {
roBlobovniczaID
}
// SetBlobovniczaID sets blobovnicza ID.
func (v *rwBlobovniczaID) SetBlobovniczaID(id *blobovnicza.ID) {
v.blobovniczaID = id
}
type roRange struct {
rng *object.Range
}
// Range returns range of the object payload.
func (r roRange) Range() *object.Range {
return r.rng
}
type rwRange struct {
roRange
}
// SetRange sets range of the object payload.
func (r *rwRange) SetRange(rng *object.Range) {
r.rng = rng
}
type rangeData struct {
data []byte
}
// RangeData returns data of the requested payload range.
func (d rangeData) RangeData() []byte {
return d.data
}

86
pkg/local_object_storage/blobstor/blobovniczatree/control.go Normal file
View file

@ -0,0 +1,86 @@
package blobovniczatree
import (
"fmt"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobovnicza"
"go.uber.org/zap"
)
// Open opens blobovnicza tree.
func (b *Blobovniczas) Open(readOnly bool) error {
b.readOnly = readOnly
return nil
}
// Init initializes blobovnicza tree.
//
// Should be called exactly once.
func (b *Blobovniczas) Init() error {
b.log.Debug("initializing Blobovnicza's")
err := b.CConfig.Init()
if err != nil {
return err
}
b.onClose = append(b.onClose, func() {
if err := b.CConfig.Close(); err != nil {
b.log.Debug("can't close zstd compressor", zap.String("err", err.Error()))
}
})
if b.readOnly {
b.log.Debug("read-only mode, skip blobovniczas initialization...")
return nil
}
return b.Iterate(false, func(p string, blz *blobovnicza.Blobovnicza) error {
if err := blz.Init(); err != nil {
return fmt.Errorf("could not initialize blobovnicza structure %s: %w", p, err)
}
b.log.Debug("blobovnicza successfully initialized, closing...", zap.String("id", p))
return nil
})
}
// closes blobovnicza tree.
func (b *Blobovniczas) Close() error {
b.activeMtx.Lock()
b.lruMtx.Lock()
for p, v := range b.active {
if err := v.blz.Close(); err != nil {
b.log.Debug("could not close active blobovnicza",
zap.String("path", p),
zap.String("error", err.Error()),
)
}
b.opened.Remove(p)
}
for _, k := range b.opened.Keys() {
v, _ := b.opened.Get(k)
blz := v.(*blobovnicza.Blobovnicza)
if err := blz.Close(); err != nil {
b.log.Debug("could not close active blobovnicza",
zap.String("path", k.(string)),
zap.String("error", err.Error()),
)
}
b.opened.Remove(k)
}
b.active = make(map[string]blobovniczaWithIndex)
b.lruMtx.Unlock()
b.activeMtx.Unlock()
for i := range b.onClose {
b.onClose[i]()
}
return nil
}

10
pkg/local_object_storage/blobstor/blobovniczatree/delete.go Normal file
View file

@ -0,0 +1,10 @@
package blobovniczatree
// DeleteSmallPrm groups the parameters of DeleteSmall operation.
type DeleteSmallPrm struct {
address
rwBlobovniczaID
}
// DeleteSmallRes groups the resulting values of DeleteSmall operation.
type DeleteSmallRes struct{}

2
pkg/local_object_storage/blobstor/errors.go → pkg/local_object_storage/blobstor/blobovniczatree/errors.go
View file

@ -1,4 +1,4 @@
package blobstor
package blobovniczatree
import (
"errors"

38
pkg/local_object_storage/blobstor/blobovniczatree/exists.go Normal file
View file

@ -0,0 +1,38 @@
package blobovniczatree
import (
"path/filepath"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobovnicza"
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
"go.uber.org/zap"
)
func (b *Blobovniczas) Exists(addr oid.Address) (bool, error) {
activeCache := make(map[string]struct{})
var prm blobovnicza.GetPrm
prm.SetAddress(addr)
var found bool
err := b.iterateSortedLeaves(&addr, func(p string) (bool, error) {
dirPath := filepath.Dir(p)
_, ok := activeCache[dirPath]
_, err := b.getObjectFromLevel(prm, p, !ok)
if err != nil {
if !blobovnicza.IsErrNotFound(err) {
b.log.Debug("could not get object from level",
zap.String("level", p),
zap.String("error", err.Error()))
}
}
activeCache[dirPath] = struct{}{}
found = err == nil
return found, nil
})
return found, err
}

13
pkg/local_object_storage/blobstor/blobovniczatree/get_range_small.go Normal file
View file

@ -0,0 +1,13 @@
package blobovniczatree
// GetRangeSmallPrm groups the parameters of GetRangeSmall operation.
type GetRangeSmallPrm struct {
address
rwRange
rwBlobovniczaID
}
// GetRangeSmallRes groups the resulting values of GetRangeSmall operation.
type GetRangeSmallRes struct {
rangeData
}

33
pkg/local_object_storage/blobstor/blobovniczatree/get_small.go Normal file
View file

@ -0,0 +1,33 @@
package blobovniczatree
import (
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobovnicza"
"github.com/nspcc-dev/neofs-sdk-go/object"
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
)
// GetSmallPrm groups the parameters of GetSmallPrm operation.
type GetSmallPrm struct {
addr oid.Address
blobovniczaID *blobovnicza.ID
}
// SetAddress sets object address.
func (p *GetSmallPrm) SetAddress(addr oid.Address) {
p.addr = addr
}
// SetBlobovniczaID sets blobovnicza id.
func (p *GetSmallPrm) SetBlobovniczaID(id *blobovnicza.ID) {
p.blobovniczaID = id
}
// GetSmallRes groups the resulting values of GetSmall operation.
type GetSmallRes struct {
obj *object.Object
}
// Object returns read object.
func (r GetSmallRes) Object() *object.Object {
return r.obj
}

96
pkg/local_object_storage/blobstor/blobovniczatree/option.go Normal file
View file

@ -0,0 +1,96 @@
package blobovniczatree
import (
"io/fs"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobovnicza"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/compression"
"go.uber.org/zap"
)
type cfg struct {
log *zap.Logger
perm fs.FileMode
readOnly bool
rootPath string
openedCacheSize int
blzShallowDepth uint64
blzShallowWidth uint64
*compression.CConfig
blzOpts []blobovnicza.Option
}
type Option func(*cfg)
const (
defaultPerm = 0700
defaultOpenedCacheSize = 50
defaultBlzShallowDepth = 2
defaultBlzShallowWidth = 16
)
func initConfig(c *cfg) {
*c = cfg{
log: zap.L(),
perm: defaultPerm,
openedCacheSize: defaultOpenedCacheSize,
blzShallowDepth: defaultBlzShallowDepth,
blzShallowWidth: defaultBlzShallowWidth,
CConfig: new(compression.CConfig),
}
}
func WithLogger(l *zap.Logger) Option {
return func(c *cfg) {
c.log = l
c.blzOpts = append(c.blzOpts, blobovnicza.WithLogger(l))
}
}
func WithPermissions(perm fs.FileMode) Option {
return func(c *cfg) {
c.perm = perm
}
}
func WithCompressionConfig(cc *compression.CConfig) Option {
return func(c *cfg) {
c.CConfig = cc
}
}
func WithBlobovniczaShallowWidth(width uint64) Option {
return func(c *cfg) {
c.blzShallowWidth = width
}
}
func WithBlobovniczaShallowDepth(depth uint64) Option {
return func(c *cfg) {
c.blzShallowDepth = depth
}
}
func WithRootPath(p string) Option {
return func(c *cfg) {
c.rootPath = p
}
}
func WithBlobovniczaSize(sz uint64) Option {
return func(c *cfg) {
c.blzOpts = append(c.blzOpts, blobovnicza.WithFullSizeLimit(sz))
}
}
func WithOpenedCacheSize(sz int) Option {
return func(c *cfg) {
c.openedCacheSize = sz
}
}
func WithObjectSizeLimit(sz uint64) Option {
return func(c *cfg) {
c.blzOpts = append(c.blzOpts, blobovnicza.WithObjectSizeLimit(sz))
}
}

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

@ -6,7 +6,8 @@ import (
"path/filepath"
"sync"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobovnicza"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/blobovniczatree"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/compression"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/fstree"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode"
"github.com/nspcc-dev/neofs-node/pkg/util/logger"
@ -15,12 +16,12 @@ import (
// BlobStor represents NeoFS local BLOB storage.
type BlobStor struct {
*cfg
blobovniczas *blobovniczas
cfg
modeMtx sync.RWMutex
mode mode.Mode
blobovniczas *blobovniczatree.Blobovniczas
}
type Info = fstree.Info
@ -31,43 +32,26 @@ type Option func(*cfg)
type cfg struct {
fsTree fstree.FSTree
compressionEnabled bool
uncompressableContentTypes []string
compressor func([]byte) []byte
decompressor func([]byte) ([]byte, error)
compression.CConfig
smallSizeLimit uint64
log *logger.Logger
openedCacheSize int
blzShallowDepth, blzShallowWidth uint64
blzRootPath string
readOnly bool
blzOpts []blobovnicza.Option
blzOpts []blobovniczatree.Option
}
const (
defaultShallowDepth = 4
defaultPerm = 0700
defaultSmallSizeLimit = 1 << 20 // 1MB
defaultOpenedCacheSize = 50
defaultBlzShallowDepth = 2
defaultBlzShallowWidth = 16
defaultSmallSizeLimit = 1 << 20 // 1MB
)
const blobovniczaDir = "blobovnicza"
func defaultCfg() *cfg {
return &cfg{
func initConfig(c *cfg) {
*c = cfg{
fsTree: fstree.FSTree{
Depth: defaultShallowDepth,
DirNameLen: hex.EncodedLen(fstree.DirNameLen),
@ -76,26 +60,25 @@ func defaultCfg() *cfg {
RootPath: "./",
},
},
smallSizeLimit: defaultSmallSizeLimit,
log: zap.L(),
openedCacheSize: defaultOpenedCacheSize,
blzShallowDepth: defaultBlzShallowDepth,
blzShallowWidth: defaultBlzShallowWidth,
smallSizeLimit: defaultSmallSizeLimit,
log: zap.L(),
}
c.blzOpts = []blobovniczatree.Option{blobovniczatree.WithCompressionConfig(&c.CConfig)}
}
// New creates, initializes and returns new BlobStor instance.
func New(opts ...Option) *BlobStor {
c := defaultCfg()
bs := new(BlobStor)
initConfig(&bs.cfg)
for i := range opts {
opts[i](c)
opts[i](&bs.cfg)
}
return &BlobStor{
cfg: c,
blobovniczas: newBlobovniczaTree(c),
}
bs.blobovniczas = blobovniczatree.NewBlobovniczaTree(bs.blzOpts...)
bs.blzOpts = nil
return bs
}
// SetLogger sets logger. It is used after the shard ID was generated to use it in logs.
@ -127,7 +110,7 @@ func WithShallowDepth(depth int) Option {
// is recorded in the provided log.
func WithCompressObjects(comp bool) Option {
return func(c *cfg) {
c.compressionEnabled = comp
c.Enabled = comp
}
}
@ -135,7 +118,7 @@ func WithCompressObjects(comp bool) Option {
// for specific content types as seen by object.AttributeContentType attribute.
func WithUncompressableContentTypes(values []string) Option {
return func(c *cfg) {
c.uncompressableContentTypes = values
c.UncompressableContentTypes = values
}
}
@ -144,7 +127,7 @@ func WithUncompressableContentTypes(values []string) Option {
func WithRootPath(rootDir string) Option {
return func(c *cfg) {
c.fsTree.RootPath = rootDir
c.blzRootPath = filepath.Join(rootDir, blobovniczaDir)
c.blzOpts = append(c.blzOpts, blobovniczatree.WithRootPath(filepath.Join(rootDir, blobovniczaDir)))
}
}
@ -153,7 +136,7 @@ func WithRootPath(rootDir string) Option {
func WithRootPerm(perm fs.FileMode) Option {
return func(c *cfg) {
c.fsTree.Permissions = perm
c.blzOpts = append(c.blzOpts, blobovnicza.WithPermissions(perm))
c.blzOpts = append(c.blzOpts, blobovniczatree.WithPermissions(perm))
}
}
@ -162,7 +145,7 @@ func WithRootPerm(perm fs.FileMode) Option {
func WithSmallSizeLimit(lim uint64) Option {
return func(c *cfg) {
c.smallSizeLimit = lim
c.blzOpts = append(c.blzOpts, blobovnicza.WithObjectSizeLimit(lim))
c.blzOpts = append(c.blzOpts, blobovniczatree.WithObjectSizeLimit(lim))
}
}
@ -170,7 +153,7 @@ func WithSmallSizeLimit(lim uint64) Option {
func WithLogger(l *logger.Logger) Option {
return func(c *cfg) {
c.log = l.With(zap.String("component", "BlobStor"))
c.blzOpts = append(c.blzOpts, blobovnicza.WithLogger(l))
c.blzOpts = append(c.blzOpts, blobovniczatree.WithLogger(c.log))
}
}
@ -178,7 +161,7 @@ func WithLogger(l *logger.Logger) Option {
// depth of blobovnicza directories.
func WithBlobovniczaShallowDepth(d uint64) Option {
return func(c *cfg) {
c.blzShallowDepth = d
c.blzOpts = append(c.blzOpts, blobovniczatree.WithBlobovniczaShallowDepth(d))
}
}
@ -186,7 +169,7 @@ func WithBlobovniczaShallowDepth(d uint64) Option {
// width of blobovnicza directories.
func WithBlobovniczaShallowWidth(w uint64) Option {
return func(c *cfg) {
c.blzShallowWidth = w
c.blzOpts = append(c.blzOpts, blobovniczatree.WithBlobovniczaShallowWidth(w))
}
}
@ -194,7 +177,7 @@ func WithBlobovniczaShallowWidth(w uint64) Option {
// maximum number of opened non-active blobovnicza's.
func WithBlobovniczaOpenedCacheSize(sz int) Option {
return func(c *cfg) {
c.openedCacheSize = sz
c.blzOpts = append(c.blzOpts, blobovniczatree.WithOpenedCacheSize(sz))
}
}
@ -202,6 +185,6 @@ func WithBlobovniczaOpenedCacheSize(sz int) Option {
// of each blobovnicza.
func WithBlobovniczaSize(sz uint64) Option {
return func(c *cfg) {
c.blzOpts = append(c.blzOpts, blobovnicza.WithFullSizeLimit(sz))
c.blzOpts = append(c.blzOpts, blobovniczatree.WithBlobovniczaSize(sz))
}
}

6
pkg/local_object_storage/blobstor/blobstor_test.go
View file

@ -5,6 +5,7 @@ import (
"testing"
"github.com/nspcc-dev/neofs-node/pkg/core/object"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/blobovniczatree"
objectSDK "github.com/nspcc-dev/neofs-sdk-go/object"
"github.com/stretchr/testify/require"
)
@ -37,7 +38,10 @@ func TestCompression(t *testing.T) {
}
testGet := func(t *testing.T, b *BlobStor, i int) {
res1, err := b.GetSmall(GetSmallPrm{address: address{object.AddressOf(smallObj[i])}})
var prm blobovniczatree.GetSmallPrm
prm.SetAddress(object.AddressOf(smallObj[i]))
res1, err := b.GetSmall(prm)
require.NoError(t, err)
require.Equal(t, smallObj[i], res1.Object())

39
pkg/local_object_storage/blobstor/compress.go
View file

@ -1,39 +0,0 @@
package blobstor
import (
"github.com/klauspost/compress/zstd"
)
// zstdFrameMagic contains first 4 bytes of any compressed object
// https://github.com/klauspost/compress/blob/master/zstd/framedec.go#L58 .
var zstdFrameMagic = []byte{0x28, 0xb5, 0x2f, 0xfd}
func noOpCompressor(data []byte) []byte {
return data
}
func noOpDecompressor(data []byte) ([]byte, error) {
return data, nil
}
func zstdCompressor() (*zstd.Encoder, func([]byte) []byte, error) {
enc, err := zstd.NewWriter(nil)
if err != nil {
return nil, nil, err
}
return enc, func(data []byte) []byte {
return enc.EncodeAll(data, make([]byte, 0, len(data)))
}, nil
}
func zstdDecompressor() (*zstd.Decoder, func([]byte) ([]byte, error), error) {
dec, err := zstd.NewReader(nil)
if err != nil {
return nil, nil, err
}
return dec, func(data []byte) ([]byte, error) {
return dec.DecodeAll(data, nil)
}, nil
}

102
pkg/local_object_storage/blobstor/compression/compress.go Normal file
View file

@ -0,0 +1,102 @@
package compression
import (
"bytes"
"strings"
"github.com/klauspost/compress/zstd"
objectSDK "github.com/nspcc-dev/neofs-sdk-go/object"
)
// CConfig represents common compression-related configuration.
type CConfig struct {
Enabled bool
UncompressableContentTypes []string
encoder *zstd.Encoder
decoder *zstd.Decoder
}
// zstdFrameMagic contains first 4 bytes of any compressed object
// https://github.com/klauspost/compress/blob/master/zstd/framedec.go#L58 .
var zstdFrameMagic = []byte{0x28, 0xb5, 0x2f, 0xfd}
// Init initializes compression routines.
func (c *CConfig) Init() error {
var err error
if c.Enabled {
c.encoder, err = zstd.NewWriter(nil)
if err != nil {
return err
}
}
c.decoder, err = zstd.NewReader(nil)
if err != nil {
return err
}
return nil
}
// NeedsCompression returns true if the object should be compressed.
// For an object to be compressed 2 conditions must hold:
// 1. Compression is enabled in settings.
// 2. Object MIME Content-Type is allowed for compression.
func (c *CConfig) NeedsCompression(obj *objectSDK.Object) bool {
if !c.Enabled || len(c.UncompressableContentTypes) == 0 {
return c.Enabled
}
for _, attr := range obj.Attributes() {
if attr.Key() == objectSDK.AttributeContentType {
for _, value := range c.UncompressableContentTypes {
match := false
switch {
case len(value) > 0 && value[len(value)-1] == '*':
match = strings.HasPrefix(attr.Value(), value[:len(value)-1])
case len(value) > 0 && value[0] == '*':
match = strings.HasSuffix(attr.Value(), value[1:])
default:
match = attr.Value() == value
}
if match {
return false
}
}
}
}
return c.Enabled
}
// Decompress decompresses data if it starts with the magic
// and returns data untouched otherwise.
func (c *CConfig) Decompress(data []byte) ([]byte, error) {
if len(data) < 4 || !bytes.Equal(data[:4], zstdFrameMagic) {
return data, nil
}
return c.decoder.DecodeAll(data, nil)
}
// Compress compresses data if compression is enabled
// and returns data untouched otherwise.
func (c *CConfig) Compress(data []byte) []byte {
if c.Enabled {
return c.encoder.EncodeAll(data, make([]byte, 0, len(data)))
}
return data
}
// Close closes encoder and decoder, returns any error occured.
func (c *CConfig) Close() error {
var err error
if c.encoder != nil {
err = c.encoder.Close()
}
if c.decoder != nil {
c.decoder.Close()
}
return err
}

8
pkg/local_object_storage/blobstor/control.go
View file

@ -9,9 +9,7 @@ import (
func (b *BlobStor) Open(readOnly bool) error {
b.log.Debug("opening...")
b.blobovniczas.readOnly = readOnly
return nil
return b.blobovniczas.Open(readOnly)
}
// ErrInitBlobovniczas is returned when blobovnicza initialization fails.
@ -25,7 +23,7 @@ var ErrInitBlobovniczas = errors.New("failure on blobovnicza initialization stag
func (b *BlobStor) Init() error {
b.log.Debug("initializing...")
err := b.blobovniczas.init()
err := b.blobovniczas.Init()
if err != nil {
return fmt.Errorf("%w: %v", ErrInitBlobovniczas, err)
}
@ -37,5 +35,5 @@ func (b *BlobStor) Init() error {
func (b *BlobStor) Close() error {
b.log.Debug("closing...")
return b.blobovniczas.close()
return b.blobovniczas.Close()
}

14
pkg/local_object_storage/blobstor/delete_big.go → pkg/local_object_storage/blobstor/delete.go
View file

@ -3,6 +3,7 @@ package blobstor
import (
"errors"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/blobovniczatree"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/fstree"
storagelog "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/internal/log"
apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status"
@ -36,3 +37,16 @@ func (b *BlobStor) DeleteBig(prm DeleteBigPrm) (DeleteBigRes, error) {
return DeleteBigRes{}, err
}
// DeleteSmall removes an object from blobovnicza of BLOB storage.
//
// If blobovnicza ID is not set or set to nil, BlobStor tries to
// find and remove object from any blobovnicza.
//
// Returns any error encountered that did not allow
// to completely remove the object.
//
// Returns an error of type apistatus.ObjectNotFound if there is no object to delete.
func (b *BlobStor) DeleteSmall(prm blobovniczatree.DeleteSmallPrm) (blobovniczatree.DeleteSmallRes, error) {
return b.blobovniczas.Delete(prm)
}

23
pkg/local_object_storage/blobstor/delete_small.go
View file

@ -1,23 +0,0 @@
package blobstor
// DeleteSmallPrm groups the parameters of DeleteSmall operation.
type DeleteSmallPrm struct {
address
rwBlobovniczaID
}
// DeleteSmallRes groups the resulting values of DeleteSmall operation.
type DeleteSmallRes struct{}
// DeleteSmall removes an object from blobovnicza of BLOB storage.
//
// If blobovnicza ID is not set or set to nil, BlobStor tries to
// find and remove object from any blobovnicza.
//
// Returns any error encountered that did not allow
// to completely remove the object.
//
// Returns an error of type apistatus.ObjectNotFound if there is no object to delete.
func (b *BlobStor) DeleteSmall(prm DeleteSmallPrm) (DeleteSmallRes, error) {
return b.blobovniczas.delete(prm)
}

33
pkg/local_object_storage/blobstor/exists.go
View file

@ -2,9 +2,7 @@ package blobstor
import (
"errors"
"path/filepath"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobovnicza"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/fstree"
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
"go.uber.org/zap"
@ -76,34 +74,5 @@ func (b *BlobStor) existsBig(addr oid.Address) (bool, error) {
// existsSmall checks if object is presented in blobovnicza.
func (b *BlobStor) existsSmall(addr oid.Address) (bool, error) {
return b.blobovniczas.existsSmall(addr)
}
func (b *blobovniczas) existsSmall(addr oid.Address) (bool, error) {
activeCache := make(map[string]struct{})
var prm blobovnicza.GetPrm
prm.SetAddress(addr)
var found bool
err := b.iterateSortedLeaves(&addr, func(p string) (bool, error) {
dirPath := filepath.Dir(p)
_, ok := activeCache[dirPath]
_, err := b.getObjectFromLevel(prm, p, !ok)
if err != nil {
if !blobovnicza.IsErrNotFound(err) {
b.log.Debug("could not get object from level",
zap.String("level", p),
zap.String("error", err.Error()))
}
}
activeCache[dirPath] = struct{}{}
found = err == nil
return found, nil
})
return found, err
return b.blobovniczas.Exists(addr)
}

18
pkg/local_object_storage/blobstor/exists_test.go
View file

@ -6,6 +6,7 @@ import (
"testing"
objectCore "github.com/nspcc-dev/neofs-node/pkg/core/object"
cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test"
objectSDK "github.com/nspcc-dev/neofs-sdk-go/object"
oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test"
"github.com/stretchr/testify/require"
@ -77,3 +78,20 @@ func TestExists(t *testing.T) {
require.Error(t, err)
})
}
func testObject(sz uint64) *objectSDK.Object {
raw := objectSDK.New()
raw.SetID(oidtest.ID())
raw.SetContainerID(cidtest.ID())
raw.SetPayload(make([]byte, sz))
// fit the binary size to the required
data, _ := raw.Marshal()
if ln := uint64(len(data)); ln > sz {
raw.SetPayload(raw.Payload()[:sz-(ln-sz)])
}
return raw
}

7
pkg/local_object_storage/blobstor/get_big.go → pkg/local_object_storage/blobstor/get.go
View file

@ -4,6 +4,7 @@ import (
"errors"
"fmt"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/blobovniczatree"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/fstree"
apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status"
objectSDK "github.com/nspcc-dev/neofs-sdk-go/object"
@ -39,7 +40,7 @@ func (b *BlobStor) GetBig(prm GetBigPrm) (GetBigRes, error) {
return GetBigRes{}, fmt.Errorf("could not read object from fs tree: %w", err)
}
data, err = b.decompressor(data)
data, err = b.Decompress(data)
if err != nil {
return GetBigRes{}, fmt.Errorf("could not decompress object data: %w", err)
}
@ -56,3 +57,7 @@ func (b *BlobStor) GetBig(prm GetBigPrm) (GetBigRes, error) {
},
}, nil
}
func (b *BlobStor) GetSmall(prm blobovniczatree.GetSmallPrm) (blobovniczatree.GetSmallRes, error) {
return b.blobovniczas.Get(prm)
}

17
pkg/local_object_storage/blobstor/get_range_big.go → pkg/local_object_storage/blobstor/get_range.go
View file

@ -4,6 +4,7 @@ import (
"errors"
"fmt"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/blobovniczatree"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/fstree"
apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status"
objectSDK "github.com/nspcc-dev/neofs-sdk-go/object"
@ -40,7 +41,7 @@ func (b *BlobStor) GetRangeBig(prm GetRangeBigPrm) (GetRangeBigRes, error) {
return GetRangeBigRes{}, fmt.Errorf("could not read object from fs tree: %w", err)
}
data, err = b.decompressor(data)
data, err = b.Decompress(data)
if err != nil {
return GetRangeBigRes{}, fmt.Errorf("could not decompress object data: %w", err)
}
@ -66,3 +67,17 @@ func (b *BlobStor) GetRangeBig(prm GetRangeBigPrm) (GetRangeBigRes, error) {
},
}, nil
}
// GetRangeSmall reads data of object payload range from blobovnicza of BLOB storage.
//
// If blobovnicza ID is not set or set to nil, BlobStor tries to get payload range
// from any blobovnicza.
//
// Returns any error encountered that
// did not allow to completely read the object payload range.
//
// Returns ErrRangeOutOfBounds if the requested object range is out of bounds.
// Returns an error of type apistatus.ObjectNotFound if the requested object is missing in blobovnicza(s).
func (b *BlobStor) GetRangeSmall(prm blobovniczatree.GetRangeSmallPrm) (blobovniczatree.GetRangeSmallRes, error) {
return b.blobovniczas.GetRange(prm)
}

27
pkg/local_object_storage/blobstor/get_range_small.go
View file

@ -1,27 +0,0 @@
package blobstor
// GetRangeSmallPrm groups the parameters of GetRangeSmall operation.
type GetRangeSmallPrm struct {
address
rwRange
rwBlobovniczaID
}
// GetRangeSmallRes groups the resulting values of GetRangeSmall operation.
type GetRangeSmallRes struct {
rangeData
}
// GetRangeSmall reads data of object payload range from blobovnicza of BLOB storage.
//
// If blobovnicza ID is not set or set to nil, BlobStor tries to get payload range
// from any blobovnicza.
//
// Returns any error encountered that
// did not allow to completely read the object payload range.
//
// Returns ErrRangeOutOfBounds if the requested object range is out of bounds.
// Returns an error of type apistatus.ObjectNotFound if the requested object is missing in blobovnicza(s).
func (b *BlobStor) GetRangeSmall(prm GetRangeSmallPrm) (GetRangeSmallRes, error) {
return b.blobovniczas.getRange(prm)
}

25
pkg/local_object_storage/blobstor/get_small.go
View file

@ -1,25 +0,0 @@
package blobstor
// GetSmallPrm groups the parameters of GetSmallPrm operation.
type GetSmallPrm struct {
address
rwBlobovniczaID
}
// GetSmallRes groups the resulting values of GetSmall operation.
type GetSmallRes struct {
roObject
}
// GetSmall reads the object from blobovnicza of BLOB storage by address.
//
// If blobovnicza ID is not set or set to nil, BlobStor tries to get the object
// from any blobovnicza.
//
// Returns any error encountered that
// did not allow to completely read the object.
//
// Returns an error of type apistatus.ObjectNotFound if the requested object is missing in blobovnicza(s).
func (b *BlobStor) GetSmall(prm GetSmallPrm) (GetSmallRes, error) {
return b.blobovniczas.get(prm)
}

6
pkg/local_object_storage/blobstor/iterate.go
View file

@ -72,12 +72,12 @@ func (i *IteratePrm) SetErrorHandler(f func(oid.Address, error) error) {
func (b *BlobStor) Iterate(prm IteratePrm) (IterateRes, error) {
var elem IterationElement
err := b.blobovniczas.iterateBlobovniczas(prm.ignoreErrors, func(p string, blz *blobovnicza.Blobovnicza) error {
err := b.blobovniczas.Iterate(prm.ignoreErrors, func(p string, blz *blobovnicza.Blobovnicza) error {
err := blobovnicza.IterateObjects(blz, func(addr oid.Address, data []byte) error {
var err error
// decompress the data
elem.data, err = b.decompressor(data)
elem.data, err = b.Decompress(data)
if err != nil {
if prm.ignoreErrors {
if prm.errorHandler != nil {
@ -109,7 +109,7 @@ func (b *BlobStor) Iterate(prm IteratePrm) (IterateRes, error) {
fsPrm.WithIgnoreErrors(prm.ignoreErrors)
fsPrm.WithHandler(func(addr oid.Address, data []byte) error {
// decompress the data
elem.data, err = b.decompressor(data)
elem.data, err = b.Decompress(data)
if err != nil {
if prm.ignoreErrors {
if prm.errorHandler != nil {

231
pkg/local_object_storage/blobstor/iterate_test.go
View file

@ -1,17 +1,11 @@
package blobstor
import (
"bytes"
"encoding/binary"
"errors"
"os"
"path/filepath"
"strconv"
"testing"
"github.com/klauspost/compress/zstd"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobovnicza"
"github.com/nspcc-dev/neofs-sdk-go/object"
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test"
"github.com/stretchr/testify/require"
@ -97,116 +91,117 @@ func TestIterateObjects(t *testing.T) {
}
func TestIterate_IgnoreErrors(t *testing.T) {
dir := t.TempDir()
const (
smallSize = 512
objCount = 5
)
bsOpts := []Option{
WithCompressObjects(true),
WithRootPath(dir),
WithSmallSizeLimit(smallSize * 2), // + header
WithBlobovniczaOpenedCacheSize(1),
WithBlobovniczaShallowWidth(1),
WithBlobovniczaShallowDepth(1)}
bs := New(bsOpts...)
require.NoError(t, bs.Open(false))
require.NoError(t, bs.Init())
addrs := make([]oid.Address, objCount)
for i := range addrs {
addrs[i] = oidtest.Address()
obj := object.New()
obj.SetContainerID(addrs[i].Container())
obj.SetID(addrs[i].Object())
obj.SetPayload(make([]byte, smallSize<<(i%2)))
objData, err := obj.Marshal()
require.NoError(t, err)
_, err = bs.PutRaw(addrs[i], objData, true)
require.NoError(t, err)
}
// Construct corrupted compressed object.
buf := bytes.NewBuffer(nil)
badObject := make([]byte, smallSize/2+1)
enc, err := zstd.NewWriter(buf)
require.NoError(t, err)
rawData := enc.EncodeAll(badObject, nil)
for i := 4; /* magic size */ i < len(rawData); i += 2 {
rawData[i] ^= 0xFF
}
// Will be put uncompressed but fetched as compressed because of magic.
_, err = bs.PutRaw(oidtest.Address(), rawData, false)
require.NoError(t, err)
require.NoError(t, bs.fsTree.Put(oidtest.Address(), rawData))
require.NoError(t, bs.Close())
// Increase width to have blobovnicza which is definitely empty.
b := New(append(bsOpts, WithBlobovniczaShallowWidth(2))...)
require.NoError(t, b.Open(false))
require.NoError(t, b.Init())
var p string
for i := 0; i < 2; i++ {
bp := filepath.Join(bs.blzRootPath, "1", strconv.FormatUint(uint64(i), 10))
if _, ok := bs.blobovniczas.opened.Get(bp); !ok {
p = bp
break
}
}
require.NotEqual(t, "", p, "expected to not have at least 1 blobovnicza in cache")
require.NoError(t, os.Chmod(p, 0))
require.NoError(t, b.Close())
require.NoError(t, bs.Open(false))
require.NoError(t, bs.Init())
var prm IteratePrm
prm.SetIterationHandler(func(e IterationElement) error {
return nil
})
_, err = bs.Iterate(prm)
require.Error(t, err)
prm.IgnoreErrors()
t.Run("skip invalid objects", func(t *testing.T) {
actual := make([]oid.Address, 0, len(addrs))
prm.SetIterationHandler(func(e IterationElement) error {
obj := object.New()
err := obj.Unmarshal(e.data)
if err != nil {
return err
}
var addr oid.Address
cnr, _ := obj.ContainerID()
addr.SetContainer(cnr)
id, _ := obj.ID()
addr.SetObject(id)
actual = append(actual, addr)
return nil
})
_, err := bs.Iterate(prm)
require.NoError(t, err)
require.ElementsMatch(t, addrs, actual)
})
t.Run("return errors from handler", func(t *testing.T) {
n := 0
expectedErr := errors.New("expected error")
prm.SetIterationHandler(func(e IterationElement) error {
if n++; n == objCount/2 {
return expectedErr
}
return nil
})
_, err := bs.Iterate(prm)
require.ErrorIs(t, err, expectedErr)
})
t.Skip()
//dir := t.TempDir()
//
//const (
// smallSize = 512
// objCount = 5
//)
//bsOpts := []Option{
// WithCompressObjects(true),
// WithRootPath(dir),
// WithSmallSizeLimit(smallSize * 2), // + header
// WithBlobovniczaOpenedCacheSize(1),
// WithBlobovniczaShallowWidth(1),
// WithBlobovniczaShallowDepth(1)}
//bs := New(bsOpts...)
//require.NoError(t, bs.Open(false))
//require.NoError(t, bs.Init())
//
//addrs := make([]oid.Address, objCount)
//for i := range addrs {
// addrs[i] = oidtest.Address()
//
// obj := object.New()
// obj.SetContainerID(addrs[i].Container())
// obj.SetID(addrs[i].Object())
// obj.SetPayload(make([]byte, smallSize<<(i%2)))
//
// objData, err := obj.Marshal()
// require.NoError(t, err)
//
// _, err = bs.PutRaw(addrs[i], objData, true)
// require.NoError(t, err)
//}
//
//// Construct corrupted compressed object.
//buf := bytes.NewBuffer(nil)
//badObject := make([]byte, smallSize/2+1)
//enc, err := zstd.NewWriter(buf)
//require.NoError(t, err)
//rawData := enc.EncodeAll(badObject, nil)
//for i := 4; /* magic size */ i < len(rawData); i += 2 {
// rawData[i] ^= 0xFF
//}
//// Will be put uncompressed but fetched as compressed because of magic.
//_, err = bs.PutRaw(oidtest.Address(), rawData, false)
//require.NoError(t, err)
//require.NoError(t, bs.fsTree.Put(oidtest.Address(), rawData))
//
//require.NoError(t, bs.Close())
//
//// Increase width to have blobovnicza which is definitely empty.
//b := New(append(bsOpts, WithBlobovniczaShallowWidth(2))...)
//require.NoError(t, b.Open(false))
//require.NoError(t, b.Init())
//
//var p string
//for i := 0; i < 2; i++ {
// bp := filepath.Join(bs.rootPath, "1", strconv.FormatUint(uint64(i), 10))
// if _, ok := bs.blobovniczas.opened.Get(bp); !ok {
// p = bp
// break
// }
//}
//require.NotEqual(t, "", p, "expected to not have at least 1 blobovnicza in cache")
//require.NoError(t, os.Chmod(p, 0))
//
//require.NoError(t, b.Close())
//require.NoError(t, bs.Open(false))
//require.NoError(t, bs.Init())
//
//var prm IteratePrm
//prm.SetIterationHandler(func(e IterationElement) error {
// return nil
//})
//_, err = bs.Iterate(prm)
//require.Error(t, err)
//
//prm.IgnoreErrors()
//
//t.Run("skip invalid objects", func(t *testing.T) {
// actual := make([]oid.Address, 0, len(addrs))
// prm.SetIterationHandler(func(e IterationElement) error {
// obj := object.New()
// err := obj.Unmarshal(e.data)
// if err != nil {
// return err
// }
//
// var addr oid.Address
// cnr, _ := obj.ContainerID()
// addr.SetContainer(cnr)
// id, _ := obj.ID()
// addr.SetObject(id)
// actual = append(actual, addr)
// return nil
// })
//
// _, err := bs.Iterate(prm)
// require.NoError(t, err)
// require.ElementsMatch(t, addrs, actual)
//})
//t.Run("return errors from handler", func(t *testing.T) {
// n := 0
// expectedErr := errors.New("expected error")
// prm.SetIterationHandler(func(e IterationElement) error {
// if n++; n == objCount/2 {
// return expectedErr
// }
// return nil
// })
// _, err := bs.Iterate(prm)
// require.ErrorIs(t, err, expectedErr)
//})
}

1
pkg/local_object_storage/blobstor/mode.go
View file

@ -29,7 +29,6 @@ func (b *BlobStor) SetMode(m mode.Mode) error {
return fmt.Errorf("can't set blobstor mode (old=%s, new=%s): %w", b.mode, m, err)
}
b.blobovniczas.readOnly = m.ReadOnly()
b.mode = m
return nil
}

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

@ -3,7 +3,6 @@ package blobstor
import (
"fmt"
"os"
"strings"
"github.com/klauspost/compress/zstd"
"github.com/nspcc-dev/neofs-node/pkg/core/object"
@ -45,30 +44,7 @@ func (b *BlobStor) Put(prm PutPrm) (PutRes, error) {
// 1. Compression is enabled in settings.
// 2. Object MIME Content-Type is allowed for compression.
func (b *BlobStor) NeedsCompression(obj *objectSDK.Object) bool {
if !b.compressionEnabled || len(b.uncompressableContentTypes) == 0 {
return b.compressionEnabled
}
for _, attr := range obj.Attributes() {
if attr.Key() == objectSDK.AttributeContentType {
for _, value := range b.uncompressableContentTypes {
match := false
switch {
case len(value) > 0 && value[len(value)-1] == '*':
match = strings.HasPrefix(attr.Value(), value[:len(value)-1])
case len(value) > 0 && value[0] == '*':
match = strings.HasSuffix(attr.Value(), value[1:])
default:
match = attr.Value() == value
}
if match {
return false
}
}
}
}
return b.compressionEnabled
return b.cfg.CConfig.NeedsCompression(obj)
}
// PutRaw saves an already marshaled object in BLOB storage.
@ -98,11 +74,11 @@ func (b *BlobStor) PutRaw(addr oid.Address, data []byte, compress bool) (PutRes,
}
if compress {
data = b.compressor(data)
data = b.CConfig.Compress(data)
}
// save object in blobovnicza
res, err := b.blobovniczas.put(addr, data)
res, err := b.blobovniczas.Put(addr, data)
if err != nil {
return PutRes{}, err
}

3
pkg/local_object_storage/shard/delete.go
View file

@ -3,6 +3,7 @@ package shard
import (
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobovnicza"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/blobovniczatree"
meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/writecache"
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
@ -35,7 +36,7 @@ func (s *Shard) Delete(prm DeletePrm) (DeleteRes, error) {
}
ln := len(prm.addr)
var delSmallPrm blobstor.DeleteSmallPrm
var delSmallPrm blobovniczatree.DeleteSmallPrm
var delBigPrm blobstor.DeleteBigPrm
smalls := make(map[oid.Address]*blobovnicza.ID, ln)

3
pkg/local_object_storage/shard/get.go
View file

@ -5,6 +5,7 @@ import (
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobovnicza"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/blobovniczatree"
meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/writecache"
apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status"
@ -76,7 +77,7 @@ func (s *Shard) Get(prm GetPrm) (GetRes, error) {
}
small = func(stor *blobstor.BlobStor, id *blobovnicza.ID) (*objectSDK.Object, error) {
var getSmallPrm blobstor.GetSmallPrm
var getSmallPrm blobovniczatree.GetSmallPrm
getSmallPrm.SetAddress(prm.addr)
getSmallPrm.SetBlobovniczaID(id)

3
pkg/local_object_storage/shard/range.go
View file

@ -3,6 +3,7 @@ package shard
import (
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobovnicza"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/blobovniczatree"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/writecache"
apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status"
"github.com/nspcc-dev/neofs-sdk-go/object"
@ -89,7 +90,7 @@ func (s *Shard) GetRange(prm RngPrm) (RngRes, error) {
}
small = func(stor *blobstor.BlobStor, id *blobovnicza.ID) (*object.Object, error) {
var getRngSmallPrm blobstor.GetRangeSmallPrm
var getRngSmallPrm blobovniczatree.GetRangeSmallPrm
getRngSmallPrm.SetAddress(prm.addr)
getRngSmallPrm.SetRange(rng)
getRngSmallPrm.SetBlobovniczaID(id)