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

[#521] *: use stdlib errors package

Browse source 
Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2021-05-18 11:12:51 +03:00 • committed by Alex Vanin
parent 43e575cec2
commit 71b87155ef
171 changed files with 825 additions and 674 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pkg/local_object_storage/metabase/iterators.go
View file

@ -1,12 +1,13 @@
package meta
import (
"errors"
"fmt"
"strconv"
"github.com/nspcc-dev/neofs-api-go/pkg/container"
"github.com/nspcc-dev/neofs-api-go/pkg/object"
objectV2 "github.com/nspcc-dev/neofs-api-go/v2/object"
"github.com/pkg/errors"
"go.etcd.io/bbolt"
)
@ -60,7 +61,7 @@ func (db *DB) iterateExpired(tx *bbolt.Tx, epoch uint64, h ExpiredObjectHandler)
expiresAt, err := strconv.ParseUint(string(expKey), 10, 64)
if err != nil {
return errors.Wrap(err, "could not parse expiration epoch")
return fmt.Errorf("could not parse expiration epoch: %w", err)
} else if expiresAt >= epoch {
return nil
}
@ -70,14 +71,14 @@ func (db *DB) iterateExpired(tx *bbolt.Tx, epoch uint64, h ExpiredObjectHandler)
err = id.Parse(string(idKey))
if err != nil {
return errors.Wrap(err, "could not parse ID of expired object")
return fmt.Errorf("could not parse ID of expired object: %w", err)
}
cid := container.NewID()
err = cid.Parse(string(cidBytes))
if err != nil {
return errors.Wrap(err, "could not parse container ID of expired bucket")
return fmt.Errorf("could not parse container ID of expired bucket: %w", err)
}
addr := object.NewAddress()
@ -133,7 +134,7 @@ func (db *DB) iterateCoveredByTombstones(tx *bbolt.Tx, tss map[string]struct{},
if _, ok := tss[string(v)]; ok {
addr, err := addressFromKey(k)
if err != nil {
return errors.Wrap(err, "could not parse address of the object under tombstone")
return fmt.Errorf("could not parse address of the object under tombstone: %w", err)
}
return h(addr)