Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@

### Changed

- [#6821](https://github.com/ChainSafe/forest/pull/6821): Added message receipt size and event size to `forest-tool archive info` output.

### Removed

### Fixed
Expand Down
9 changes: 9 additions & 0 deletions src/db/memory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,15 @@ pub struct MemoryDB {
}

impl MemoryDB {
pub fn blockstore_size_bytes(&self) -> usize {
self.blockchain_db
.read()
.iter()
.chain(self.blockchain_persistent_db.read().iter())
.map(|(k, v)| k.to_bytes().len() + v.len())
.sum()
}

pub async fn export_forest_car<W: tokio::io::AsyncWrite + Unpin>(
&self,
writer: &mut W,
Expand Down
32 changes: 25 additions & 7 deletions src/tool/subcommands/archive_cmd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ use crate::shim::executor::{Receipt, StampedEvent};
use crate::shim::fvm_shared_latest::address::Network;
use crate::shim::machine::GLOBAL_MULTI_ENGINE;
use crate::state_manager::{ExecutedTipset, NO_CALLBACK, apply_block_messages};
use crate::tool::subcommands::api_cmd::generate_test_snapshot::ReadOpsTrackingStore;
use crate::utils::db::car_stream::{CarBlock, CarBlockWrite as _, CarStream};
use crate::utils::multihash::MultihashCode;
use anyhow::{Context as _, bail};
Expand Down Expand Up @@ -311,7 +312,9 @@ pub struct ArchiveInfo {
tipsets: ChainEpoch,
messages: ChainEpoch,
message_receipts: usize,
message_receipts_size: usize,
events: usize,
events_size: usize,
head: Tipset,
snapshot_version: FilecoinSnapshotVersion,
index_size_bytes: Option<u64>,
Expand All @@ -325,8 +328,18 @@ impl std::fmt::Display for ArchiveInfo {
writeln!(f, "Epoch: {}", self.epoch)?;
writeln!(f, "State-roots: {}", self.epoch - self.tipsets + 1)?;
writeln!(f, "Messages sets: {}", self.epoch - self.messages + 1)?;
writeln!(f, "Message receipts: {}", self.message_receipts)?;
writeln!(f, "Receipts: {}", self.message_receipts)?;
writeln!(
f,
"Receipts size: {}",
self.message_receipts_size.human_count_bytes()
)?;
writeln!(f, "Events: {}", self.events)?;
writeln!(
f,
"Events size: {}",
self.events_size.human_count_bytes()
)?;
let head_tipset_key_string = self
.head
.cids()
Expand Down Expand Up @@ -387,7 +400,7 @@ impl ArchiveInfo {
let mut network: String = "unknown".into();
let mut lowest_stateroot_epoch = root_epoch;
let mut lowest_message_epoch = root_epoch;
let mut message_receipts_count = 0;
let mut message_receipt_count = 0;
let mut events_count = 0;

let iter = if progress {
Expand All @@ -405,7 +418,8 @@ impl ArchiveInfo {
network = butterflynet::NETWORK_COMMON_NAME.into();
}
};

let receipt_tracking_store = ReadOpsTrackingStore::new(store);
let event_tracking_store = ReadOpsTrackingStore::new(store);
for (parent, tipset) in iter {
if tipset.epoch() >= parent.epoch() && parent.epoch() != root_epoch {
bail!("Broken invariant: non-sequential epochs");
Expand All @@ -427,11 +441,13 @@ impl ArchiveInfo {
lowest_message_epoch = tipset.epoch();
}

if let Ok(receipts) = Receipt::get_receipts(store, *tipset.parent_message_receipts()) {
message_receipts_count += 1;
if let Ok(receipts) =
Receipt::get_receipts(&receipt_tracking_store, *tipset.parent_message_receipts())
{
for receipt in receipts {
message_receipt_count += 1;
if let Some(events_root) = receipt.events_root()
&& let Ok(e) = StampedEvent::get_events(store, &events_root)
&& let Ok(e) = StampedEvent::get_events(&event_tracking_store, &events_root)
{
events_count += e.len();
}
Expand Down Expand Up @@ -461,8 +477,10 @@ impl ArchiveInfo {
epoch: root_epoch,
tipsets: lowest_stateroot_epoch,
messages: lowest_message_epoch,
message_receipts: message_receipts_count,
message_receipts: message_receipt_count,
message_receipts_size: receipt_tracking_store.tracker.blockstore_size_bytes(),
events: events_count,
events_size: event_tracking_store.tracker.blockstore_size_bytes(),
head,
snapshot_version,
index_size_bytes,
Expand Down
Loading