acid-ant/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#1581] node: Do not lose API version on forwarding

Browse source 
Forwarded requests contained zero version in their meta header. It did not
allow responding with API statuses (`v0.0` version considered to be older
than `v2.11`) to the forwarding node and, therefore, did not allow analyzing
responses.

Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
This commit is contained in:
Pavel Karpy 2022-07-06 00:09:30 +03:00 committed by LeL
parent c8506b247e
commit 9a6da336db
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -13,6 +13,7 @@ Changelog for NeoFS Node
- Do not replicate object twice to the same node (#1410) - Do not replicate object twice to the same node (#1410)
- Concurrent object handling by the Policer (#1411) - Concurrent object handling by the Policer (#1411)
- Attaching API version to the forwarded requests (#1581)
### Removed ### Removed

13
pkg/services/object/get/v2/util.go
View file

@ -24,6 +24,7 @@ import (
neofscrypto "github.com/nspcc-dev/neofs-sdk-go/crypto" neofscrypto "github.com/nspcc-dev/neofs-sdk-go/crypto"
"github.com/nspcc-dev/neofs-sdk-go/object" "github.com/nspcc-dev/neofs-sdk-go/object"
oid "github.com/nspcc-dev/neofs-sdk-go/object/id" oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
versionSDK "github.com/nspcc-dev/neofs-sdk-go/version"
"github.com/nspcc-dev/tzhash/tz" "github.com/nspcc-dev/tzhash/tz"
) )
@ -76,6 +77,7 @@ func (s *Service) toPrm(req *objectV2.GetRequest, stream objectSvc.GetObjectStre
metaHdr.SetTTL(meta.GetTTL() - 1) metaHdr.SetTTL(meta.GetTTL() - 1)
// TODO: #1165 think how to set the other fields // TODO: #1165 think how to set the other fields
metaHdr.SetOrigin(meta) metaHdr.SetOrigin(meta)
writeCurrentVersion(metaHdr)
req.SetMetaHeader(metaHdr) req.SetMetaHeader(metaHdr)
@ -218,6 +220,7 @@ func (s *Service) toRangePrm(req *objectV2.GetRangeRequest, stream objectSvc.Get
metaHdr.SetTTL(meta.GetTTL() - 1) metaHdr.SetTTL(meta.GetTTL() - 1)
// TODO: #1165 think how to set the other fields // TODO: #1165 think how to set the other fields
metaHdr.SetOrigin(meta) metaHdr.SetOrigin(meta)
writeCurrentVersion(metaHdr)
req.SetMetaHeader(metaHdr) req.SetMetaHeader(metaHdr)
@ -405,6 +408,7 @@ func (s *Service) toHeadPrm(ctx context.Context, req *objectV2.HeadRequest, resp
metaHdr.SetTTL(meta.GetTTL() - 1) metaHdr.SetTTL(meta.GetTTL() - 1)
// TODO: #1165 think how to set the other fields // TODO: #1165 think how to set the other fields
metaHdr.SetOrigin(meta) metaHdr.SetOrigin(meta)
writeCurrentVersion(metaHdr)
req.SetMetaHeader(metaHdr) req.SetMetaHeader(metaHdr)
@ -608,3 +612,12 @@ func groupAddressRequestForwarder(f func(network.Address, client.MultiAddressCli
return res, firstErr return res, firstErr
} }
} }
func writeCurrentVersion(metaHdr *session.RequestMetaHeader) {
versionV2 := new(refs.Version)
apiVersion := versionSDK.Current()
apiVersion.WriteToV2(versionV2)
metaHdr.SetVersion(versionV2)
}