diff --git a/storage/aptosdb/src/db/include/aptosdb_internal.rs b/storage/aptosdb/src/db/include/aptosdb_internal.rs index 5dfc7cbf690d1..ffc6029eef439 100644 --- a/storage/aptosdb/src/db/include/aptosdb_internal.rs +++ b/storage/aptosdb/src/db/include/aptosdb_internal.rs @@ -21,12 +21,15 @@ impl AptosDB { Arc::clone(&state_merkle_db), pruner_config.state_merkle_pruner_config, ); + println!("new indexer"); let epoch_snapshot_pruner = StateMerklePrunerManager::new( Arc::clone(&state_merkle_db), pruner_config.epoch_snapshot_pruner_config.into(), ); let state_kv_pruner = StateKvPrunerManager::new(Arc::clone(&state_kv_db), pruner_config.ledger_pruner_config); + println!("new state store"); + let state_store = Arc::new(StateStore::new( Arc::clone(&ledger_db), Arc::clone(&state_merkle_db), @@ -39,7 +42,7 @@ impl AptosDB { empty_buffered_state_for_restore, skip_index_and_usage, )); - + println!("new ledger pruner"); let ledger_pruner = LedgerPrunerManager::new(Arc::clone(&ledger_db), pruner_config.ledger_pruner_config); @@ -75,14 +78,14 @@ impl AptosDB { pruner_config.eq(&NO_OP_STORAGE_PRUNER_CONFIG) || !readonly, "Do not set prune_window when opening readonly.", ); - + println!("open_internal"); let (ledger_db, state_merkle_db, state_kv_db) = Self::open_dbs( db_paths, rocksdb_configs, readonly, max_num_nodes_per_lru_cache_shard, )?; - + println!("open_internal 2"); let mut myself = Self::new_with_dbs( ledger_db, state_merkle_db, @@ -95,6 +98,7 @@ impl AptosDB { ); if !readonly && enable_indexer { + println!("open_internal 3"); myself.open_indexer( db_paths.default_root_path(), rocksdb_configs.index_db_config, @@ -109,8 +113,11 @@ impl AptosDB { db_root_path: impl AsRef, rocksdb_config: RocksdbConfig, ) -> Result<()> { + println!("open_indexer"); let indexer = Indexer::open(&db_root_path, rocksdb_config)?; + println!("open_indexer 2"); let ledger_next_version = self.get_synced_version().map_or(0, |v| v + 1); + println!("open_indexer 3"); info!( indexer_next_version = indexer.next_version(), ledger_next_version = ledger_next_version, @@ -123,12 +130,14 @@ impl AptosDB { let state_view = db.state_view_at_version(Some(ledger_next_version - 1))?; let annotator = AptosValueAnnotator::new(&state_view); - + println!("open_indexer 6, annotator"); const BATCH_SIZE: Version = 10000; let mut next_version = indexer.next_version(); while next_version < ledger_next_version { + println!("open_indexer 4, next_version: {}, ledger_next_version: {}", next_version, ledger_next_version); info!(next_version = next_version, "AptosDB Indexer catching up. ",); let end_version = std::cmp::min(ledger_next_version, next_version + BATCH_SIZE); + println!("open_indexer 5, end_version: {}", end_version); let write_sets = self .ledger_db .write_set_db() @@ -138,9 +147,11 @@ impl AptosDB { next_version = end_version; } + println!("open_indexer 7, indexer"); } + println!("open_indexer 8, indexer"); info!("AptosDB Indexer caught up."); - + println!("open_indexer 9, indexer"); self.indexer = Some(indexer); Ok(()) } diff --git a/storage/aptosdb/src/db/mod.rs b/storage/aptosdb/src/db/mod.rs index 0ca007e984f19..8d36ee7573b74 100644 --- a/storage/aptosdb/src/db/mod.rs +++ b/storage/aptosdb/src/db/mod.rs @@ -163,20 +163,23 @@ impl AptosDB { readonly: bool, max_num_nodes_per_lru_cache_shard: usize, ) -> Result<(LedgerDb, StateMerkleDb, StateKvDb)> { + println!("open_dbs"); let ledger_db = LedgerDb::new(db_paths.ledger_db_root_path(), rocksdb_configs, readonly)?; + println!("open_dbs 2"); let state_kv_db = StateKvDb::new( db_paths, rocksdb_configs, readonly, ledger_db.metadata_db_arc(), )?; + println!("open_dbs 3"); let state_merkle_db = StateMerkleDb::new( db_paths, rocksdb_configs, readonly, max_num_nodes_per_lru_cache_shard, )?; - + println!("open_dbs 4"); Ok((ledger_db, state_merkle_db, state_kv_db)) }