realloc/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Releases Packages Activity

[#222] Move ErrAlreadyRemoved to core package

Browse source 
Signed-off-by: Alex Vanin <alexey@nspcc.ru>
This commit is contained in:
Alex Vanin 2020-12-01 13:48:28 +03:00
parent 6a3e3e5642
commit 67d4b0db12
8 changed files with 18 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pkg/local_object_storage/engine/range.go
View file

@ -5,7 +5,6 @@ import (
objectSDK "github.com/nspcc-dev/neofs-api-go/pkg/object"
"github.com/nspcc-dev/neofs-node/pkg/core/object"
meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase/v2"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard"
"go.uber.org/zap"
)
@ -75,7 +74,7 @@ func (e *StorageEngine) GetRange(prm *RngPrm) (*RngRes, error) {
switch {
case errors.Is(err, object.ErrNotFound):
return false // ignore, go to next shard
case errors.Is(err, meta.ErrAlreadyRemoved):
case errors.Is(err, object.ErrAlreadyRemoved):
alreadyRemoved = true
return true // stop, return it back
@ -98,7 +97,7 @@ func (e *StorageEngine) GetRange(prm *RngPrm) (*RngRes, error) {
if obj == nil {
if alreadyRemoved {
return nil, meta.ErrAlreadyRemoved
return nil, object.ErrAlreadyRemoved
}
return nil, object.ErrNotFound