forked from TrueCloudLab/frostfs-node
[#460] services/util: Remove HandleUnaryRequest
There is no need in a wrapper with many from-`interface{}` conversions. Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
This commit is contained in:
parent
785d81a68a
commit
167a67f0b8
17 changed files with 76 additions and 339 deletions
|
@ -8,6 +8,7 @@ import (
|
|||
"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/netmap"
|
||||
"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs"
|
||||
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/version"
|
||||
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util/response"
|
||||
netmapSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap"
|
||||
versionsdk "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version"
|
||||
)
|
||||
|
@ -18,6 +19,8 @@ type executorSvc struct {
|
|||
state NodeState
|
||||
|
||||
netInfo NetworkInfo
|
||||
|
||||
respSvc *response.Service
|
||||
}
|
||||
|
||||
// NodeState encapsulates information
|
||||
|
@ -42,8 +45,8 @@ type NetworkInfo interface {
|
|||
Dump(versionsdk.Version) (*netmapSDK.NetworkInfo, error)
|
||||
}
|
||||
|
||||
func NewExecutionService(s NodeState, v versionsdk.Version, netInfo NetworkInfo) Server {
|
||||
if s == nil || netInfo == nil || !version.IsValid(v) {
|
||||
func NewExecutionService(s NodeState, v versionsdk.Version, netInfo NetworkInfo, respSvc *response.Service) Server {
|
||||
if s == nil || netInfo == nil || !version.IsValid(v) || respSvc == nil {
|
||||
// this should never happen, otherwise it programmers bug
|
||||
panic("can't create netmap execution service")
|
||||
}
|
||||
|
@ -51,6 +54,7 @@ func NewExecutionService(s NodeState, v versionsdk.Version, netInfo NetworkInfo)
|
|||
res := &executorSvc{
|
||||
state: s,
|
||||
netInfo: netInfo,
|
||||
respSvc: respSvc,
|
||||
}
|
||||
|
||||
v.WriteToV2(&res.version)
|
||||
|
@ -96,6 +100,7 @@ func (s *executorSvc) LocalNodeInfo(
|
|||
resp := new(netmap.LocalNodeInfoResponse)
|
||||
resp.SetBody(body)
|
||||
|
||||
s.respSvc.SetMeta(resp)
|
||||
return resp, nil
|
||||
}
|
||||
|
||||
|
@ -126,6 +131,7 @@ func (s *executorSvc) NetworkInfo(
|
|||
resp := new(netmap.NetworkInfoResponse)
|
||||
resp.SetBody(body)
|
||||
|
||||
s.respSvc.SetMeta(resp)
|
||||
return resp, nil
|
||||
}
|
||||
|
||||
|
@ -143,5 +149,6 @@ func (s *executorSvc) Snapshot(_ context.Context, _ *netmap.SnapshotRequest) (*n
|
|||
resp := new(netmap.SnapshotResponse)
|
||||
resp.SetBody(body)
|
||||
|
||||
s.respSvc.SetMeta(resp)
|
||||
return resp, nil
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue