Handle JsonRpcService startup failure (solana-labs#27075)

yu3ver · Aug 12, 2022 · e50013a · e50013a
1 parent 6c58acf
commit e50013a
Show file tree

Hide file tree

Showing 7 changed files with 223 additions and 202 deletions.
diff --git a/core/src/replay_stage.rs b/core/src/replay_stage.rs
@@ -397,9 +397,9 @@ impl ReplayStage {
         drop_bank_sender: Sender<Vec<Arc<Bank>>>,
         block_metadata_notifier: Option<BlockMetadataNotifierLock>,
         log_messages_bytes_limit: Option<usize>,
-    ) -> Self {
+    ) -> Result<Self, String> {
         let mut tower = if let Some(process_blockstore) = maybe_process_blockstore {
-            let tower = process_blockstore.process_to_create_tower();
+            let tower = process_blockstore.process_to_create_tower()?;
             info!("Tower state: {:?}", tower);
             tower
         } else {
@@ -940,10 +940,10 @@ impl ReplayStage {
             })
             .unwrap();
 
-        Self {
+        Ok(Self {
             t_replay,
             commitment_service,
-        }
+        })
     }
 
     fn check_for_vote_only_mode(

diff --git a/core/src/tvu.rs b/core/src/tvu.rs
@@ -129,7 +129,7 @@ impl Tvu {
         accounts_background_request_sender: AbsRequestSender,
         log_messages_bytes_limit: Option<usize>,
         connection_cache: &Arc<ConnectionCache>,
-    ) -> Self {
+    ) -> Result<Self, String> {
         let TvuSockets {
             repair: repair_socket,
             fetch: fetch_sockets,
@@ -288,7 +288,7 @@ impl Tvu {
             drop_bank_sender,
             block_metadata_notifier,
             log_messages_bytes_limit,
-        );
+        )?;
 
         let ledger_cleanup_service = tvu_config.max_ledger_shreds.map(|max_ledger_shreds| {
             LedgerCleanupService::new(
@@ -301,7 +301,7 @@ impl Tvu {
             )
         });
 
-        Tvu {
+        Ok(Tvu {
             fetch_stage,
             shred_sigverify,
             retransmit_stage,
@@ -313,7 +313,7 @@ impl Tvu {
             voting_service,
             warm_quic_cache_service,
             drop_bank_service,
-        }
+        })
     }
 
     pub fn join(self) -> thread::Result<()> {
@@ -450,7 +450,8 @@ pub mod tests {
             AbsRequestSender::default(),
             None,
             &Arc::new(ConnectionCache::default()),
-        );
+        )
+        .expect("assume success");
         exit.store(true, Ordering::Relaxed);
         tvu.join().unwrap();
         poh_service.join().unwrap();