Merge pull request #2931 from blockstack/fix/race-to-connect

next-costs fix: invoke connect early to avoid race-to-connect

.github/workflows/stacks-blockchain.yml

@@ -218,7 +218,7 @@ jobs:
           tag_name: ${{ github.event.inputs.tag || github.ref }}
           release_name: Release ${{ github.event.inputs.tag || github.ref }}
           draft: false
-          prerelease: false
+          prerelease: true
 
   # Upload distributables to a new release if we're building a tag or a tag was passed in
   upload-dist:

testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs

@@ -1469,6 +1469,17 @@ impl BurnchainController for BitcoinRegtestController {
         }
     }
 
+    fn connect_dbs(&mut self) -> Result<(), BurnchainControllerError> {
+        let (burnchain, burnchain_indexer) = self.setup_indexer_runtime();
+        burnchain.connect_db(
+            &burnchain_indexer,
+            true,
+            burnchain_indexer.get_first_block_header_hash()?,
+            burnchain_indexer.get_first_block_header_timestamp()?,
+        )?;
+        Ok(())
+    }
+
     fn start(
         &mut self,
         target_block_height_opt: Option<u64>,

testnet/stacks-node/src/burnchains/mocknet_controller.rs

@@ -287,4 +287,8 @@ impl BurnchainController for MocknetController {
 
     #[cfg(test)]
     fn bootstrap_chain(&mut self, _num_blocks: u64) {}
+
+    fn connect_dbs(&mut self) -> Result<(), BurnchainControllerError> {
+        Ok(())
+    }
 }

testnet/stacks-node/src/burnchains/mod.rs

@@ -30,6 +30,12 @@ impl fmt::Display for Error {
     }
 }
 
+impl From<burnchains::Error> for Error {
+    fn from(e: burnchains::Error) -> Self {
+        Error::IndexerError(e)
+    }
+}
+
 pub trait BurnchainController {
     fn start(&mut self, target_block_height_opt: Option<u64>)
         -> Result<(BurnchainTip, u64), Error>;
@@ -43,7 +49,9 @@ pub trait BurnchainController {
     fn sortdb_ref(&self) -> &SortitionDB;
     fn sortdb_mut(&mut self) -> &mut SortitionDB;
     fn get_chain_tip(&self) -> BurnchainTip;
-
+    /// Invoke connect() on underlying burnchain and sortition databases, to perform any migration
+    ///  or instantiation before other callers may use open()
+    fn connect_dbs(&mut self) -> Result<(), Error>;
     #[cfg(test)]
     fn bootstrap_chain(&mut self, blocks_count: u64);
 }

testnet/stacks-node/src/run_loop/neon.rs

@@ -165,6 +165,7 @@ impl RunLoop {
             burnchain_opt,
             Some(should_keep_running.clone()),
         );
+
         let pox_constants = burnchain.get_pox_constants();
 
         let is_miner = if self.config.node.miner {
@@ -217,6 +218,12 @@ impl RunLoop {
             }
         };
 
+        // Invoke connect() to perform any db instantiation early
+        if let Err(e) = burnchain.connect_dbs() {
+            error!("Failed to connect to burnchain databases: {}", e);
+            return;
+        };
+
         let mainnet = self.config.is_mainnet();
         let chainid = self.config.burnchain.chain_id;
         let initial_balances = self