Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix state merkle truncate #15800

Merged
merged 1 commit into from
Jan 23, 2025
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: 1 addition & 1 deletion storage/aptosdb/src/ledger_db/ledger_metadata_db.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ impl LedgerMetadataDb {
)
}

pub(super) fn db(&self) -> &DB {
pub(crate) fn db(&self) -> &DB {
&self.db
}

Expand Down
18 changes: 10 additions & 8 deletions storage/aptosdb/src/state_store/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ impl StateStore {
if crash_if_difference_is_too_large {
assert_le!(difference, MAX_COMMIT_PROGRESS_DIFFERENCE);
}
truncate_ledger_db(ledger_db, overall_commit_progress)
truncate_ledger_db(ledger_db.clone(), overall_commit_progress)
.expect("Failed to truncate ledger db.");

// State K/V commit progress isn't (can't be) written atomically with the data,
Expand Down Expand Up @@ -427,16 +427,18 @@ impl StateStore {
assert_le!(difference, MAX_COMMIT_PROGRESS_DIFFERENCE);
}
}
let db = state_merkle_db.metadata_db();
let state_merkle_target_version =
find_tree_root_at_or_before(db, &state_merkle_db, overall_commit_progress)
.expect("DB read failed.")
.unwrap_or_else(|| {
panic!(
let state_merkle_target_version = find_tree_root_at_or_before(
ledger_metadata_db,
&state_merkle_db,
overall_commit_progress,
)
.expect("DB read failed.")
.unwrap_or_else(|| {
panic!(
"Could not find a valid root before or at version {}, maybe it was pruned?",
overall_commit_progress
)
});
});
if state_merkle_target_version < state_merkle_max_version {
info!(
state_merkle_max_version = state_merkle_max_version,
Expand Down
11 changes: 7 additions & 4 deletions storage/aptosdb/src/utils/truncation_helper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#![allow(dead_code)]

use crate::{
ledger_db::{LedgerDb, LedgerDbSchemaBatches},
ledger_db::{ledger_metadata_db::LedgerMetadataDb, LedgerDb, LedgerDbSchemaBatches},
schema::{
db_metadata::{DbMetadataKey, DbMetadataSchema, DbMetadataValue},
epoch_by_version::EpochByVersionSchema,
Expand Down Expand Up @@ -201,7 +201,7 @@ pub(crate) fn truncate_state_merkle_db_single_shard(
}

pub(crate) fn find_tree_root_at_or_before(
ledger_metadata_db: &DB,
ledger_metadata_db: &LedgerMetadataDb,
state_merkle_db: &StateMerkleDb,
version: Version,
) -> Result<Option<Version>> {
Expand All @@ -214,16 +214,19 @@ pub(crate) fn find_tree_root_at_or_before(

// It's possible that it's a partial commit when sharding is not enabled,
// look again for the previous version:
if version == 0 {
return Ok(None);
}
if let Some(closest_version) =
find_closest_node_version_at_or_before(state_merkle_db.metadata_db(), version)?
find_closest_node_version_at_or_before(state_merkle_db.metadata_db(), version - 1)?
{
if root_exists_at_version(state_merkle_db, closest_version)? {
return Ok(Some(closest_version));
}

// Now we are probably looking at a pruned version in this epoch, look for the previous
// epoch ending:
let mut iter = ledger_metadata_db.iter::<EpochByVersionSchema>()?;
let mut iter = ledger_metadata_db.db().iter::<EpochByVersionSchema>()?;
iter.seek_for_prev(&version)?;
if let Some((closest_epoch_version, _)) = iter.next().transpose()? {
if root_exists_at_version(state_merkle_db, closest_epoch_version)? {
Expand Down
2 changes: 1 addition & 1 deletion testsuite/smoke-test/src/storage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ async fn test_db_restart() {
quit_flag.clone(),
));

for round in 0..3 {
for round in 0..10 {
info!("{LINE} Restart round {round}");
for (v, vid) in restarting_validator_ids.iter().enumerate() {
let validator = swarm.validator_mut(*vid).unwrap();
Expand Down
Loading