TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 95 Pull requests 4 Projects Releases 1 Activity Actions

[#217] storage engine: Transform Inhume to batch operation

Browse source 
Make `StorageEngine.Inhume` to process list of objects per single operation.

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2021-02-19 17:01:01 +03:00 committed by Alex Vanin
parent 53b4d6d6d0
commit 7a4e3efa95
2 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/neofs-node/object.go
View file

@ -108,7 +108,7 @@ func (r *localObjectInhumer) DeleteObjects(ts *objectSDK.Address, addr ...*objec
prm := new(engine.InhumePrm) prm := new(engine.InhumePrm)
for _, a := range addr { for _, a := range addr {
prm.WithTarget(a, ts) prm.WithTarget(ts, a)
if _, err := r.storage.Inhume(prm); err != nil { if _, err := r.storage.Inhume(prm); err != nil {
r.log.Error("could not delete object", r.log.Error("could not delete object",

31
pkg/local_object_storage/engine/inhume.go
View file

@ -11,17 +11,20 @@ import (
// InhumePrm encapsulates parameters for inhume operation. // InhumePrm encapsulates parameters for inhume operation.
type InhumePrm struct { type InhumePrm struct {
addr, tombstone *objectSDK.Address tombstone *objectSDK.Address
addrs []*objectSDK.Address
} }
// InhumeRes encapsulates results of inhume operation. // InhumeRes encapsulates results of inhume operation.
type InhumeRes struct{} type InhumeRes struct{}
// WithTarget sets object address that should be inhumed and tombstone address // WithTarget sets list of objects that should be inhumed and tombstone address
// as the reason for inhume operation. // as the reason for inhume operation.
func (p *InhumePrm) WithTarget(addr, tombstone *objectSDK.Address) *InhumePrm { //
// tombstone should not be nil, addr should not be empty.
func (p *InhumePrm) WithTarget(tombstone *objectSDK.Address, addrs ...*objectSDK.Address) *InhumePrm {
if p != nil { if p != nil {
p.addr = addr p.addrs = addrs
p.tombstone = tombstone p.tombstone = tombstone
} }
@ -33,20 +36,24 @@ var errInhumeFailure = errors.New("inhume operation failed")
// Inhume calls metabase. Inhume method to mark object as removed. It won't be // Inhume calls metabase. Inhume method to mark object as removed. It won't be
// removed physically from shard until `Delete` operation. // removed physically from shard until `Delete` operation.
func (e *StorageEngine) Inhume(prm *InhumePrm) (*InhumeRes, error) { func (e *StorageEngine) Inhume(prm *InhumePrm) (*InhumeRes, error) {
shPrm := new(shard.InhumePrm).WithTarget(prm.tombstone, prm.addr) shPrm := new(shard.InhumePrm)
res := e.inhume(prm.addr, shPrm, true) for i := range prm.addrs {
if res == nil { shPrm.WithTarget(prm.tombstone, prm.addrs[i])
res = e.inhume(prm.addr, shPrm, false)
if res == nil { ok := e.inhume(prm.addrs[i], shPrm, true)
if ok {
ok = e.inhume(prm.addrs[i], shPrm, false)
if ok {
return nil, errInhumeFailure return nil, errInhumeFailure
} }
} }
}
return res, nil return new(InhumeRes), nil
} }
func (e *StorageEngine) inhume(addr *objectSDK.Address, prm *shard.InhumePrm, checkExists bool) (res *InhumeRes) { func (e *StorageEngine) inhume(addr *objectSDK.Address, prm *shard.InhumePrm, checkExists bool) (ok bool) {
e.iterateOverSortedShards(addr, func(_ int, sh *shard.Shard) (stop bool) { e.iterateOverSortedShards(addr, func(_ int, sh *shard.Shard) (stop bool) {
if checkExists { if checkExists {
exRes, err := sh.Exists(new(shard.ExistsPrm). exRes, err := sh.Exists(new(shard.ExistsPrm).
@ -73,7 +80,7 @@ func (e *StorageEngine) inhume(addr *objectSDK.Address, prm *shard.InhumePrm, ch
zap.String("error", err.Error()), zap.String("error", err.Error()),
) )
} else { } else {
res = new(InhumeRes) ok = true
} }
return err == nil return err == nil