Fix deadlock

qdrvm · Jul 24, 2023 · 8cd5694 · 8cd5694
1 parent 0488f75
commit 8cd5694
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/core/consensus/babe/impl/babe_config_repository_impl.cpp b/core/consensus/babe/impl/babe_config_repository_impl.cpp
@@ -93,10 +93,16 @@ namespace kagome::consensus::babe {
   }
 
   bool BabeConfigRepositoryImpl::prepare() {
-    std::unique_lock lock{indexer_mutex_};
     auto finalized = block_tree_->getLastFinalized();
     auto finalized_header = block_tree_->getBlockHeader(finalized.hash).value();
-    if (finalized.number - indexer_.last_finalized_indexed_.number
+
+    primitives::BlockNumber indexer_last_finalized;
+    {
+      std::unique_lock lock{indexer_mutex_};
+      indexer_last_finalized = indexer_.last_finalized_indexed_.number;
+    }
+
+    if (finalized.number - indexer_last_finalized
             > kMaxUnindexedBlocksNum
         and trie_storage_->getEphemeralBatchAt(finalized_header.state_root)) {
       warp(finalized);