Merge pull request #2566 from nspcc-dev/fix-service-shutdown

*: properly unsubscribe from Blockchain events

pkg/consensus/consensus.go

@@ -286,6 +286,7 @@ events:
 		select {
 		case <-s.quit:
 			s.dbft.Timer.Stop()
+			s.Chain.UnsubscribeFromBlocks(s.blockEvents)
 			break events
 		case <-s.dbft.Timer.C():
 			hv := s.dbft.Timer.HV()
@@ -331,6 +332,15 @@ events:
 		default:
 		}
 	}
+drainBlocksLoop:
+	for {
+		select {
+		case <-s.blockEvents:
+		default:
+			break drainBlocksLoop
+		}
+	}
+	close(s.blockEvents)
 	close(s.finished)
 }
 

pkg/network/server.go

@@ -1344,11 +1344,12 @@ func (s *Server) broadcastHPMessage(msg *Message) {
 func (s *Server) relayBlocksLoop() {
 	ch := make(chan *block.Block, 2) // Some buffering to smooth out possible egressing delays.
 	s.chain.SubscribeForBlocks(ch)
+mainloop:
 	for {
 		select {
 		case <-s.quit:
 			s.chain.UnsubscribeFromBlocks(ch)
-			return
+			break mainloop
 		case b := <-ch:
 			msg := NewMessage(CMDInv, payload.NewInventory(payload.BlockType, []util.Uint256{b.Hash()}))
 			// Filter out nodes that are more current (avoid spamming the network
@@ -1359,6 +1360,15 @@ func (s *Server) relayBlocksLoop() {
 			s.extensiblePool.RemoveStale(b.Index)
 		}
 	}
+drainBlocksLoop:
+	for {
+		select {
+		case <-ch:
+		default:
+			break drainBlocksLoop
+		}
+	}
+	close(ch)
 }
 
 // verifyAndPoolTX verifies the TX and adds it to the local mempool.

pkg/services/notary/notary.go

@@ -167,12 +167,13 @@ func (n *Notary) Start() {
 }
 
 func (n *Notary) mainLoop() {
+mainloop:
 	for {
 		select {
 		case <-n.stopCh:
 			n.mp.UnsubscribeFromTransactions(n.reqCh)
 			n.Config.Chain.UnsubscribeFromBlocks(n.blocksCh)
-			return
+			break mainloop
 		case event := <-n.reqCh:
 			if req, ok := event.Data.(*payload.P2PNotaryRequest); ok {
 				switch event.Type {
@@ -187,6 +188,17 @@ func (n *Notary) mainLoop() {
 			n.PostPersist()
 		}
 	}
+drainLoop:
+	for {
+		select {
+		case <-n.blocksCh:
+		case <-n.reqCh:
+		default:
+			break drainLoop
+		}
+	}
+	close(n.blocksCh)
+	close(n.reqCh)
 }
 
 // Shutdown stops the Notary module.

pkg/services/stateroot/validators.go

@@ -55,6 +55,7 @@ drainloop:
 			break drainloop
 		}
 	}
+	close(s.blockCh)
 }
 
 // Shutdown stops the service.