TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 105 Pull requests 10 Projects Releases 2 Activity Actions

Small fixes for netmap status transitions #1110

Merged
fyrchik merged 4 commits from fyrchik/frostfs-node:fix-status into master 2024-09-04 19:51:08 +00:00
Conversation 0 Commits 4 Files changed 2 +4 -4
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit c8e2ca2ab4 - Show all commits

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

@ -1157,10 +1157,10 @@ func (c *cfg) LocalNodeInfo() (*netmapV2.NodeInfo, error) {
return &res, nil return &res, nil
} }
// handleLocalNodeInfo rewrites local node info from the FrostFS network map. // setContractNodeInfo rewrites local node info from the FrostFS network map.
// Called with nil when storage node is outside the FrostFS network map // Called with nil when storage node is outside the FrostFS network map
// (before entering the network and after leaving it). // (before entering the network and after leaving it).
func (c *cfg) handleLocalNodeInfo(ni *netmap.NodeInfo) { func (c *cfg) setContractNodeInfo(ni *netmap.NodeInfo) {
c.cfgNetmap.state.setNodeInfo(ni) c.cfgNetmap.state.setNodeInfo(ni)
} }

4
cmd/frostfs-node/netmap.go
View file

@ -199,7 +199,7 @@ func addNewEpochNotificationHandlers(c *cfg) {
return return
} }
c.handleLocalNodeInfo(ni) c.setContractNodeInfo(ni)
}) })
if c.cfgMorph.notaryEnabled { if c.cfgMorph.notaryEnabled {
@ -270,7 +270,7 @@ func initNetmapState(c *cfg) {
c.cfgNetmap.state.setCurrentEpoch(epoch) c.cfgNetmap.state.setCurrentEpoch(epoch)
c.cfgNetmap.startEpoch = epoch c.cfgNetmap.startEpoch = epoch
c.handleLocalNodeInfo(ni) c.setContractNodeInfo(ni)
} }
func nodeState(ni *netmapSDK.NodeInfo) string { func nodeState(ni *netmapSDK.NodeInfo) string {