Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Return the composite error of PUT operation #813

Merged
merged 2 commits into from
Sep 10, 2021
Merged

Return the composite error of PUT operation #813

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b920101
[#778] services/object: Return the composite error of PUT operation
Sep 8, 2021
00fd947
[#778] services/object: Wrap last client's error into errIncompletePut
Sep 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions pkg/services/object/put/distributed.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"errors"
"fmt"
"sync"
"sync/atomic"

"github.com/nspcc-dev/neofs-node/pkg/core/object"
svcutil "github.com/nspcc-dev/neofs-node/pkg/services/object/util"
Expand Down Expand Up @@ -31,7 +32,20 @@ type distributedTarget struct {
log *logger.Logger
}

var errIncompletePut = errors.New("incomplete object put")
// errIncompletePut is returned if processing on a container fails.
type errIncompletePut struct {
singleErr error // error from the last responding node
}

func (x errIncompletePut) Error() string {
const commonMsg = "incomplete object PUT by placement"

if x.singleErr != nil {
return fmt.Sprintf("%s: %v", commonMsg, x.singleErr)
}

return commonMsg
}

func (t *distributedTarget) WriteHeader(obj *object.RawObject) error {
t.obj = obj
Expand Down Expand Up @@ -93,6 +107,8 @@ func (t *distributedTarget) iteratePlacement(f func(placement.Node) error) (*tra
return nil, fmt.Errorf("(%T) could not create object placement traverser: %w", t, err)
}

var resErr atomic.Value

loop:
for {
addrs := traverser.Next()
Expand All @@ -110,6 +126,7 @@ loop:
defer wg.Done()

if err := f(addr); err != nil {
resErr.Store(err)
svcutil.LogServiceError(t.log, "PUT", addr.Addresses(), err)
return
}
Expand All @@ -128,7 +145,11 @@ loop:
}

if !traverser.Success() {
return nil, errIncompletePut
var err errIncompletePut

err.singleErr, _ = resErr.Load().(error)

return nil, err
}

return new(transformer.AccessIdentifiers).
Expand Down