Fix muxer that can be stucked into an infinite loop (#2681)

ChainSafe · Mar 21, 2023 · 0ccda6d · 0ccda6d
1 parent 8d73139
commit 0ccda6d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -76,6 +76,7 @@ Notable updates:
 
 ### Fixed
 
+- [daemon] Daemon could get stuck in an infinite loop during shutdown
 - [libp2p] Properly cancel bitswap queries that are not responded to after a
   period. [#2399](https://github.com/ChainSafe/forest/pull/2399)
 - [console ui] `Scanning Blockchain` progess bar never hits 100% during snapshot

diff --git a/blockchain/chain_sync/src/chain_muxer.rs b/blockchain/chain_sync/src/chain_muxer.rs
@@ -886,6 +886,9 @@ where
                         );
                         metrics::NETWORK_HEAD_EVALUATION_ERRORS.inc();
                         self.state = ChainMuxerState::Idle;
+
+                        // By default bail on errors
+                        return Poll::Ready(why);
                     }
                     Poll::Pending => return Poll::Pending,
                 },