[fix] hyperledger-iroha#1232: Introduce startup time benchmark

Signed-off-by: Sam H. Smith <sam.henning.smith@protonmail.com>

Author: SamHSmith

benchmark_blockstore/blocks.data

@@ -291,6 +291,11 @@ impl Iroha {
             genesis_network: genesis,
             block_count,
         });
+        
+        if config.exit_after_init {
+            iroha_logger::error!("Exiting after init due to configuration");
+            return Err(eyre!("Exiting after init due to configuration"));
+        }
 
         let block_sync = BlockSynchronizer::from_configuration(
             &config.block_sync,

benchmark_blockstore/blocks.hashes

@@ -5,6 +5,7 @@
     "payload": "282ED9F3CF92811C3818DBC4AE594ED59DC1A2F78E4241E31924E101D6B1FB831C61FAF8FE94E253B93114240394F79A607B7FA55F9E5A41EBEC74B88055768B"
   },
   "DISABLE_PANIC_TERMINAL_COLORS": false,
+  "EXIT_AFTER_INIT": false,
   "KURA": {
     "INIT_MODE": "strict",
     "BLOCK_STORE_PATH": "./storage",

benchmark_blockstore/blocks.index

@@ -22,6 +22,8 @@ view! {
         pub private_key: PrivateKey,
         /// Disable coloring of the backtrace and error report on panic
         pub disable_panic_terminal_colors: bool,
+        /// Exit after initialization for startup time testing
+        pub exit_after_init: bool,
         /// `Kura` configuration
         #[config(inner)]
         pub kura: Box<kura::Configuration>,
@@ -69,6 +71,7 @@ impl Default for ConfigurationProxy {
             public_key: None,
             private_key: None,
             disable_panic_terminal_colors: Some(bool::default()),
+            exit_after_init: Some(false),
             kura: Some(Box::default()),
             sumeragi: Some(Box::default()),
             torii: Some(Box::default()),
@@ -208,6 +211,7 @@ mod tests {
         fn arb_proxy()(
             (public_key, private_key) in arb_keys(),
             disable_panic_terminal_colors in prop::option::of(Just(true)),
+            exit_after_init in prop::option::of(Just(true)),
             kura in prop::option::of(kura::tests::arb_proxy().prop_map(Box::new)),
             sumeragi in (prop::option::of(sumeragi::tests::arb_proxy().prop_map(Box::new))),
             torii in (prop::option::of(torii::tests::arb_proxy().prop_map(Box::new))),
@@ -221,8 +225,8 @@ mod tests {
             snapshot in prop::option::of(snapshot::tests::arb_proxy().prop_map(Box::new)),
             live_query_store in prop::option::of(live_query_store::tests::arb_proxy()),
             ) -> ConfigurationProxy {
-            ConfigurationProxy { public_key, private_key, disable_panic_terminal_colors, kura, sumeragi, torii, block_sync, queue,
-                                 logger, genesis, wsv, network, telemetry, snapshot, live_query_store }
+            ConfigurationProxy { public_key, private_key, disable_panic_terminal_colors, exit_after_init, kura, sumeragi, torii, block_sync,
+                                 queue, logger, genesis, wsv, network, telemetry, snapshot, live_query_store }
         }
     }
 

cli/src/lib.rs

@@ -2,6 +2,7 @@
   "PUBLIC_KEY": null,
   "PRIVATE_KEY": null,
   "DISABLE_PANIC_TERMINAL_COLORS": false,
+  "EXIT_AFTER_INIT": false,
   "KURA": {
     "INIT_MODE": "strict",
     "BLOCK_STORE_PATH": "./storage",

config/iroha_test_config.json

@@ -841,13 +841,7 @@ pub(crate) fn run(
         sumeragi
             .transaction_cache
             // Checking if transactions are in the blockchain is costly
-            .retain(|tx| {
-                let expired = sumeragi.queue.is_expired(tx);
-                if expired {
-                    debug!(?tx, "Transaction expired")
-                }
-                expired
-            });
+            .retain(|tx| !sumeragi.queue.is_expired(tx));
 
         let mut expired_transactions = Vec::new();
         sumeragi.queue.get_transactions_for_block(

config/src/iroha.rs

@@ -251,27 +251,24 @@ impl SumeragiHandle {
             )
         });
 
-        let current_topology = match wsv.height() {
-            0 => {
-                assert!(!configuration.trusted_peers.peers.is_empty());
-                Topology::new(configuration.trusted_peers.peers.clone())
-            }
-            height => {
-                let block_ref = kura.get_block_by_height(height).expect(
-                    "Sumeragi could not load block that was reported as present. \
-                     Please check that the block storage was not disconnected.",
-                );
-                Topology::recreate_topology(
-                    &block_ref,
-                    0,
-                    wsv.peers_ids().iter().cloned().collect(),
-                )
-            }
+        let mut current_topology = {
+            assert!(!configuration.trusted_peers.peers.is_empty());
+            Topology::new(configuration.trusted_peers.peers.clone())
         };
 
         let block_iter_except_last =
             (&mut blocks_iter).take(block_count.saturating_sub(skip_block_count + 1));
         for block in block_iter_except_last {
+            if wsv.height() == 0 {
+                current_topology = Topology::new(block.payload().commit_topology.clone());
+                wsv.world_mut().trusted_peers_ids = current_topology.ordered_peers.clone();
+            }
+
+            let new_topology =
+                Topology::recreate_topology(&block, 0, wsv.peers_ids().iter().cloned().collect());
+
+            current_topology.rotate_all_n(block.payload().header().view_change_index);
+            
             let block = ValidBlock::validate(Clone::clone(&block), &current_topology, &mut wsv)
                 .expect("Kura blocks should be valid")
                 .commit(&current_topology)
@@ -280,12 +277,26 @@ impl SumeragiHandle {
                 "Block application in init should not fail. \
                  Blocks loaded from kura assumed to be valid",
             );
+            current_topology = new_topology;
         }
 
         // finalized_wsv is one block behind
         let finalized_wsv = wsv.clone();
 
         if let Some(latest_block) = blocks_iter.next() {
+            if wsv.height() == 0 {
+                current_topology = Topology::new(latest_block.payload().commit_topology.clone());
+                wsv.world_mut().trusted_peers_ids = current_topology.ordered_peers.clone();
+            }
+
+            let new_topology = Topology::recreate_topology(
+                &latest_block,
+                0,
+                wsv.peers_ids().iter().cloned().collect(),
+            );
+
+            current_topology.rotate_all_n(latest_block.payload().header().view_change_index);
+            
             let latest_block =
                 ValidBlock::validate(Clone::clone(&latest_block), &current_topology, &mut wsv)
                     .expect("Kura blocks should be valid")
@@ -295,6 +306,7 @@ impl SumeragiHandle {
                 "Block application in init should not fail. \
                  Blocks loaded from kura assumed to be valid",
             );
+            current_topology = new_topology;
         }
 
         info!("Sumeragi has finished loading blocks and setting up the WSV");

configs/peer/config.json

@@ -33,6 +33,7 @@ The following is the default configuration used by Iroha.
   "PUBLIC_KEY": null,
   "PRIVATE_KEY": null,
   "DISABLE_PANIC_TERMINAL_COLORS": false,
+  "EXIT_AFTER_INIT": false,
   "KURA": {
     "INIT_MODE": "strict",
     "BLOCK_STORE_PATH": "./storage",
@@ -185,6 +186,16 @@ Has type `Option<bool>`[^1]. Can be configured via environment variable `IROHA_D
 false
 ```
 
+## `exit_after_init`
+
+Exit after initialization for startup time testing
+
+Has type `Option<bool>`[^1]. Can be configured via environment variable `IROHA_EXIT_AFTER_INIT`
+
+```json
+false
+```
+
 ## `genesis`
 
 `GenesisBlock` configuration