From 1e15e6375a22237b3d4485873599c9f3006a3ddd Mon Sep 17 00:00:00 2001
From: Carl <carl@solana.com>
Date: Fri, 22 Feb 2019 17:19:33 -0800
Subject: [PATCH] Check for entry height in the unchanging bank_forks_info
 instead of a racy check to blocktree

---
 src/replay_stage.rs | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/replay_stage.rs b/src/replay_stage.rs
index ac5ee89a12..6f79aab2fd 100644
--- a/src/replay_stage.rs
+++ b/src/replay_stage.rs
@@ -191,14 +191,18 @@ impl ReplayStage {
         let to_leader_sender = to_leader_sender.clone();
         let subscriptions_ = subscriptions.clone();
 
-        let (bank, last_entry_id) = {
+        let (bank, last_entry_id, mut current_blob_index) = {
             let mut bank_forks = bank_forks.write().unwrap();
             bank_forks.set_working_bank_id(bank_forks_info[0].bank_id);
-            (bank_forks.working_bank(), bank_forks_info[0].last_entry_id)
+            (
+                bank_forks.working_bank(),
+                bank_forks_info[0].last_entry_id,
+                bank_forks_info[0].entry_height,
+            )
         };
         let last_entry_id = Arc::new(RwLock::new(last_entry_id));
 
-        let mut current_blob_index = {
+        {
             let leader_scheduler = leader_scheduler.read().unwrap();
             let slot = leader_scheduler.tick_height_to_slot(bank.tick_height() + 1);
 
@@ -217,13 +221,7 @@ impl ReplayStage {
                     leader_id,
                 })
                 .unwrap();
-
-            blocktree
-                .meta(slot)
-                .expect("Database error")
-                .map(|meta| meta.consumed)
-                .unwrap_or(0)
-        };
+        }
 
         let t_replay = Builder::new()
             .name("solana-replay-stage".to_string())