george.bartolomey/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#603] cmd/node: Parse node attributes when node info is constructed

Browse source 
Remove no longer needed `cfgNodeInfo.attributes` field.

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2021-06-11 11:43:05 +03:00 committed by Alex Vanin
parent 4859bb2e1c
commit 5a4c3dfddf
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/neofs-node/config.go
View file

@ -167,7 +167,6 @@ type BootstrapType uint32
type cfgNodeInfo struct { type cfgNodeInfo struct {
// values from config // values from config
attributes []*netmap.NodeAttribute
// values at runtime // values at runtime
infoMtx sync.RWMutex infoMtx sync.RWMutex
@ -294,9 +293,6 @@ func initCfg(path string) *cfg {
reBootstrapEnabled: !relayOnly, reBootstrapEnabled: !relayOnly,
reBoostrapTurnedOff: atomic.NewBool(relayOnly), reBoostrapTurnedOff: atomic.NewBool(relayOnly),
}, },
cfgNodeInfo: cfgNodeInfo{
attributes: parseAttributes(appCfg),
},
cfgGRPC: cfgGRPC{ cfgGRPC: cfgGRPC{
maxChunkSize: maxChunkSize, maxChunkSize: maxChunkSize,
maxAddrAmount: maxAddrAmount, maxAddrAmount: maxAddrAmount,

2
cmd/neofs-node/netmap.go
View file

@ -40,7 +40,7 @@ func initNetmapService(c *cfg) {
peerInfo := new(netmapSDK.NodeInfo) peerInfo := new(netmapSDK.NodeInfo)
peerInfo.SetAddress(c.localAddr.String()) peerInfo.SetAddress(c.localAddr.String())
peerInfo.SetPublicKey(crypto.MarshalPublicKey(&c.key.PublicKey)) peerInfo.SetPublicKey(crypto.MarshalPublicKey(&c.key.PublicKey))
peerInfo.SetAttributes(c.cfgNodeInfo.attributes...) peerInfo.SetAttributes(parseAttributes(c.appCfg)...)
peerInfo.SetState(netmapSDK.NodeStateOffline) peerInfo.SetState(netmapSDK.NodeStateOffline)
c.handleLocalNodeInfo(peerInfo) c.handleLocalNodeInfo(peerInfo)