node: fix race between heartbeat and state updater (#3112)

nspcc-dev · Feb 7, 2025 · 1f4407c · 1f4407c
2 parents 3e0d534 + dcb0a28
commit 1f4407c
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/cmd/neofs-node/netmap.go b/cmd/neofs-node/netmap.go
@@ -179,17 +179,6 @@ func initNetmapService(c *cfg) {
 		c.cfgNetmap.state.setCurrentEpoch(ev.(netmapEvent.NewEpoch).EpochNumber())
 	})
 
-	addNewEpochAsyncNotificationHandler(c, func(ev event.Event) {
-		if !c.needBootstrap() || c.cfgNetmap.reBoostrapTurnedOff.Load() { // fixes #470
-			return
-		}
-
-		err := c.heartbeat()
-		if err != nil {
-			c.log.Warn("can't send heartbeat tx", zap.Error(err))
-		}
-	})
-
 	addNewEpochAsyncNotificationHandler(c, func(ev event.Event) {
 		e := ev.(netmapEvent.NewEpoch).EpochNumber()
 
@@ -204,6 +193,15 @@ func initNetmapService(c *cfg) {
 		}
 
 		c.handleLocalNodeInfoFromNetwork(ni)
+
+		if !c.needBootstrap() || c.cfgNetmap.reBoostrapTurnedOff.Load() { // fixes #470
+			return
+		}
+
+		err = c.heartbeat()
+		if err != nil {
+			c.log.Warn("can't send heartbeat tx", zap.Error(err))
+		}
 	})
 
 	addNewEpochAsyncNotificationHandler(c, func(ev event.Event) {