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

5
pkg/services/container/announcement/load/route/placement/calls.go
View file

@ -1,9 +1,10 @@
package placementrouter
import (
"fmt"
"github.com/nspcc-dev/neofs-api-go/pkg/container"
loadroute "github.com/nspcc-dev/neofs-node/pkg/services/container/announcement/load/route"
"github.com/pkg/errors"
)
// NextStage composes container nodes for the container and epoch from a,
@ -19,7 +20,7 @@ func (b *Builder) NextStage(a container.UsedSpaceAnnouncement, passed []loadrout
placement, err := b.placementBuilder.BuildPlacement(a.Epoch(), a.ContainerID())
if err != nil {
return nil, errors.Wrapf(err, "could not build placement %s", a.ContainerID())
return nil, fmt.Errorf("could not build placement %s: %w", a.ContainerID(), err)
}
res := make([]loadroute.ServerInfo, 0, len(placement))

14
pkg/services/container/executor.go
View file

@ -2,9 +2,9 @@ package container
import (
"context"
"fmt"
"github.com/nspcc-dev/neofs-api-go/v2/container"
"github.com/pkg/errors"
)
type ServiceExecutor interface {
@ -32,7 +32,7 @@ func NewExecutionService(exec ServiceExecutor) Server {
func (s *executorSvc) Put(ctx context.Context, req *container.PutRequest) (*container.PutResponse, error) {
respBody, err := s.exec.Put(ctx, req.GetBody())
if err != nil {
return nil, errors.Wrap(err, "could not execute Put request")
return nil, fmt.Errorf("could not execute Put request: %w", err)
}
resp := new(container.PutResponse)
@ -44,7 +44,7 @@ func (s *executorSvc) Put(ctx context.Context, req *container.PutRequest) (*cont
func (s *executorSvc) Delete(ctx context.Context, req *container.DeleteRequest) (*container.DeleteResponse, error) {
respBody, err := s.exec.Delete(ctx, req.GetBody())
if err != nil {
return nil, errors.Wrap(err, "could not execute Delete request")
return nil, fmt.Errorf("could not execute Delete request: %w", err)
}
resp := new(container.DeleteResponse)
@ -56,7 +56,7 @@ func (s *executorSvc) Delete(ctx context.Context, req *container.DeleteRequest)
func (s *executorSvc) Get(ctx context.Context, req *container.GetRequest) (*container.GetResponse, error) {
respBody, err := s.exec.Get(ctx, req.GetBody())
if err != nil {
return nil, errors.Wrap(err, "could not execute Get request")
return nil, fmt.Errorf("could not execute Get request: %w", err)
}
resp := new(container.GetResponse)
@ -68,7 +68,7 @@ func (s *executorSvc) Get(ctx context.Context, req *container.GetRequest) (*cont
func (s *executorSvc) List(ctx context.Context, req *container.ListRequest) (*container.ListResponse, error) {
respBody, err := s.exec.List(ctx, req.GetBody())
if err != nil {
return nil, errors.Wrap(err, "could not execute List request")
return nil, fmt.Errorf("could not execute List request: %w", err)
}
resp := new(container.ListResponse)
@ -80,7 +80,7 @@ func (s *executorSvc) List(ctx context.Context, req *container.ListRequest) (*co
func (s *executorSvc) SetExtendedACL(ctx context.Context, req *container.SetExtendedACLRequest) (*container.SetExtendedACLResponse, error) {
respBody, err := s.exec.SetExtendedACL(ctx, req.GetBody())
if err != nil {
return nil, errors.Wrap(err, "could not execute SetEACL request")
return nil, fmt.Errorf("could not execute SetEACL request: %w", err)
}
resp := new(container.SetExtendedACLResponse)
@ -92,7 +92,7 @@ func (s *executorSvc) SetExtendedACL(ctx context.Context, req *container.SetExte
func (s *executorSvc) GetExtendedACL(ctx context.Context, req *container.GetExtendedACLRequest) (*container.GetExtendedACLResponse, error) {
respBody, err := s.exec.GetExtendedACL(ctx, req.GetBody())
if err != nil {
return nil, errors.Wrap(err, "could not execute GetEACL request")
return nil, fmt.Errorf("could not execute GetEACL request: %w", err)
}
resp := new(container.GetExtendedACLResponse)

4
pkg/services/container/morph/executor.go
View file

@ -2,6 +2,7 @@ package container
import (
"context"
"fmt"
eaclSDK "github.com/nspcc-dev/neofs-api-go/pkg/acl/eacl"
containerSDK "github.com/nspcc-dev/neofs-api-go/pkg/container"
@ -11,7 +12,6 @@ import (
containerMorph "github.com/nspcc-dev/neofs-node/pkg/morph/client/container"
"github.com/nspcc-dev/neofs-node/pkg/morph/client/container/wrapper"
containerSvc "github.com/nspcc-dev/neofs-node/pkg/services/container"
"github.com/pkg/errors"
)
type morphExecutor struct {
@ -33,7 +33,7 @@ func NewExecutor(client *containerMorph.Client) containerSvc.ServiceExecutor {
func (s *morphExecutor) Put(ctx context.Context, body *container.PutRequestBody) (*container.PutResponseBody, error) {
cnr, err := containerSDK.NewVerifiedFromV2(body.GetContainer())
if err != nil {
return nil, errors.Wrap(err, "invalid format of the container structure")
return nil, fmt.Errorf("invalid format of the container structure: %w", err)
}
sig := body.GetSignature()