Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Changelog for NeoFS Node
- GC deadlock on local object storage shutdown (#3837)
- `owner mismatches signature` for stored objects (#3836)
- SN does not retry resending failed transaction because of insufficient GAS in some cases (#3839)
- Too early GET/HEAD/RANGE request failure on single SN dial failure (#3840)

### Changed
- SN returns unsigned responses to requests with API >= `v2.22` (#3785)
Expand Down
13 changes: 0 additions & 13 deletions pkg/services/object/get/exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"fmt"
"io"

clientcore "github.com/nspcc-dev/neofs-node/pkg/core/client"
"github.com/nspcc-dev/neofs-node/pkg/services/object/util"
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
"github.com/nspcc-dev/neofs-sdk-go/netmap"
Expand Down Expand Up @@ -296,18 +295,6 @@ func (exec *execCtx) headChild(id oid.ID) (*object.Object, bool) {
return nil, false
}

func (exec *execCtx) remoteClient(info clientcore.NodeInfo) (getClient, bool) {
c, err := exec.svc.clientCache.get(exec.context(), info)

if err == nil {
return c, true
}
exec.status = statusUndefined
exec.err = err
exec.log.Debug("could not construct remote node client")
return nil, false
}

func mergeSplitInfo(dst, src *object.SplitInfo) {
if last := src.GetLastPart(); !last.IsZero() {
dst.SetLastPart(last)
Expand Down
9 changes: 6 additions & 3 deletions pkg/services/object/get/remote.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@ import (
func (exec *execCtx) processNode(info client.NodeInfo) bool {
exec.log.Debug("processing node...", zap.Stringers("address group", info.AddressGroup()))

remoteClient, ok := exec.remoteClient(info)
if !ok {
return true
remoteClient, err := exec.svc.clientCache.get(exec.context(), info)
if err != nil {
exec.status = statusUndefined
exec.err = err
exec.log.Debug("could not construct remote node client", zap.Error(err))
return false
}

obj, reader, err := remoteClient.getObject(exec)
Expand Down
Loading