Skip to content

Commit 8a947a5

Browse files
committed
sn/object: Refactor forwarding code
Drop node info parameters since public key is no longer accessed. Signed-off-by: Leonard Lyubich <leonard@morphbits.io>
1 parent 9ae9cb9 commit 8a947a5

14 files changed

Lines changed: 37 additions & 44 deletions

File tree

pkg/services/object/get/get.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func (s *Service) proxyGetRequest(ctx context.Context, sortedNodeLists [][]netma
7171
continue
7272
}
7373

74-
hdr, err := proxyFn(ctx, node, conn)
74+
hdr, err := proxyFn(ctx, conn)
7575
if err == nil {
7676
if headWriter != nil {
7777
return headWriter.WriteHeader(hdr)
@@ -204,7 +204,7 @@ func (s *Service) proxyHashRequest(ctx context.Context, sortedNodeLists [][]netm
204204
continue
205205
}
206206

207-
hashes, err := proxyFn(ctx, node, conn)
207+
hashes, err := proxyFn(ctx, conn)
208208
if err == nil {
209209
return hashes, nil
210210
}

pkg/services/object/get/get_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func newTestClient() *testClient {
9595
}
9696
}
9797

98-
func (c *testClient) getObject(exec *execCtx, _ client.NodeInfo) (*object.Object, io.ReadCloser, error) {
98+
func (c *testClient) getObject(exec *execCtx) (*object.Object, io.ReadCloser, error) {
9999
v, ok := c.results[exec.address()]
100100
if !ok {
101101
var errNotFound apistatus.ObjectNotFound

pkg/services/object/get/prm.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ type RangeHashPrm struct {
3737
forwardedRangeHashResponse [][]byte
3838
}
3939

40-
type RequestForwarder func(context.Context, coreclient.NodeInfo, coreclient.MultiAddressClient) (*object.Object, error)
41-
type RangeRequestForwarder func(context.Context, coreclient.NodeInfo, coreclient.MultiAddressClient) ([][]byte, error)
40+
type RequestForwarder func(context.Context, coreclient.MultiAddressClient) (*object.Object, error)
41+
type RangeRequestForwarder func(context.Context, coreclient.MultiAddressClient) ([][]byte, error)
4242

4343
// HeadPrm groups parameters of Head service call.
4444
type HeadPrm struct {

pkg/services/object/get/remote.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func (exec *execCtx) processNode(info client.NodeInfo) bool {
1717
return true
1818
}
1919

20-
obj, reader, err := remoteClient.getObject(exec, info)
20+
obj, reader, err := remoteClient.getObject(exec)
2121

2222
var errSplitInfo *object.SplitInfoError
2323

pkg/services/object/get/service.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ type Service struct {
6060
type Option func(*cfg)
6161

6262
type getClient interface {
63-
getObject(*execCtx, client.NodeInfo) (*object.Object, io.ReadCloser, error)
63+
getObject(*execCtx) (*object.Object, io.ReadCloser, error)
6464
}
6565

6666
type cfg struct {

pkg/services/object/get/util.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,9 @@ func (c *clientCacheWrapper) get(ctx context.Context, info coreclient.NodeInfo)
176176
}, nil
177177
}
178178

179-
func (c *clientWrapper) getObject(exec *execCtx, info coreclient.NodeInfo) (*object.Object, io.ReadCloser, error) {
179+
func (c *clientWrapper) getObject(exec *execCtx) (*object.Object, io.ReadCloser, error) {
180180
if exec.isForwardingEnabled() {
181-
obj, err := exec.prm.forwarder(exec.ctx, info, c.client)
181+
obj, err := exec.prm.forwarder(exec.ctx, c.client)
182182
return obj, nil, err
183183
}
184184

@@ -219,7 +219,7 @@ func (c *clientWrapper) getObject(exec *execCtx, info coreclient.NodeInfo) (*obj
219219
}
220220

221221
if rngH := exec.prmRangeHash; rngH != nil && exec.isRangeHashForwardingEnabled() {
222-
exec.prmRangeHash.forwardedRangeHashResponse, err = exec.prm.rangeForwarder(exec.ctx, info, c.client)
222+
exec.prmRangeHash.forwardedRangeHashResponse, err = exec.prm.rangeForwarder(exec.ctx, c.client)
223223
return nil, nil, err
224224
}
225225

pkg/services/object/put/prm.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ type PutInitPrm struct {
1818

1919
copiesNumber uint32
2020

21-
relay func(client.NodeInfo, client.MultiAddressClient) error
21+
relay func(client.MultiAddressClient) error
2222

2323
containerNodes ContainerNodes
2424
ecPart iec.PartInfo
@@ -48,7 +48,7 @@ func (p *PutInitPrm) WithObject(v *object.Object) *PutInitPrm {
4848
return p
4949
}
5050

51-
func (p *PutInitPrm) WithRelay(f func(client.NodeInfo, client.MultiAddressClient) error) *PutInitPrm {
51+
func (p *PutInitPrm) WithRelay(f func(client.MultiAddressClient) error) *PutInitPrm {
5252
if p != nil {
5353
p.relay = f
5454
}

pkg/services/object/put/streamer.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ type Streamer struct {
2525

2626
target internal.Target
2727

28-
relay func(client.NodeInfo, client.MultiAddressClient) error
28+
relay func(client.MultiAddressClient) error
2929

3030
maxPayloadSz uint64 // network config
3131

@@ -256,7 +256,7 @@ func (p *Streamer) newCommonTarget(prm *PutInitPrm) internal.Target {
256256
return fmt.Errorf("could not create SDK client %s: %w", node.info.AddressGroup(), err)
257257
}
258258

259-
return p.relay(node.info, c)
259+
return p.relay(c)
260260
}
261261
}
262262

pkg/services/object/search/container.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func (exec *execCtx) executeOnContainer(ectx context.Context) {
7474
return
7575
}
7676

77-
ids, err := c.searchObjects(ctx, exec, info)
77+
ids, err := c.searchObjects(ctx, exec)
7878
if err != nil {
7979
lg.Debug("remote operation failed",
8080
zap.Error(err))

pkg/services/object/search/prm.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ type IDListWriter interface {
2929

3030
// RequestForwarder is a callback for forwarding of the
3131
// original Search requests.
32-
type RequestForwarder func(coreclient.NodeInfo, coreclient.MultiAddressClient) ([]oid.ID, error)
32+
type RequestForwarder func(coreclient.MultiAddressClient) ([]oid.ID, error)
3333

3434
// SetCommonParameters sets common parameters of the operation.
3535
func (p *Prm) SetCommonParameters(common *util.CommonPrm) {

0 commit comments

Comments
 (0)