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.

Sign up for GitHub

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: fix erroneous warning message #5846

Merged
merged 2 commits into from
Oct 19, 2023
Merged

fix: fix erroneous warning message #5846

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a249f7d
Fix erroneous warning message
hansieodendaal Oct 19, 2023
2b0013b
review comments
hansieodendaal Oct 19, 2023
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
66 changes: 40 additions & 26 deletions base_layer/core/src/chain_storage/lmdb_db/lmdb_db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1121,38 +1121,52 @@ impl LMDBDatabase {

// Orphan is a tip hash
if lmdb_exists(txn, &self.orphan_chain_tips_db, hash.as_slice())? {
// We get rid of the orphan tip
lmdb_delete(txn, &self.orphan_chain_tips_db, hash.as_slice(), "orphan_chain_tips_db")?;

// Parent becomes a tip hash
if lmdb_exists(txn, &self.orphans_db, parent_hash.as_slice())? &&
lmdb_exists(txn, &self.orphan_header_accumulated_data_db, parent_hash.as_slice())?
{
let orphan_parent_accum: Option<BlockHeaderAccumulatedData> =
lmdb_get(txn, &self.orphan_header_accumulated_data_db, parent_hash.as_slice())?;
if let Some(val) = orphan_parent_accum {
lmdb_insert(
txn,
&self.orphan_chain_tips_db,
parent_hash.as_slice(),
&ChainTipData {
hash: parent_hash,
total_accumulated_difficulty: val.total_accumulated_difficulty,
// If an orphan parent exists, it must be promoted
match (
lmdb_exists(txn, &self.orphans_db, parent_hash.as_slice())?,
lmdb_exists(txn, &self.orphan_header_accumulated_data_db, parent_hash.as_slice())?,
) {
(true, true) => {
// Parent becomes a tip hash
let orphan_parent_accum: Option<BlockHeaderAccumulatedData> =
lmdb_get(txn, &self.orphan_header_accumulated_data_db, parent_hash.as_slice())?;
match orphan_parent_accum {
Some(val) => {
lmdb_insert(
txn,
&self.orphan_chain_tips_db,
parent_hash.as_slice(),
&ChainTipData {
hash: parent_hash,
total_accumulated_difficulty: val.total_accumulated_difficulty,
},
"orphan_chain_tips_db",
)?;
},
"orphan_chain_tips_db",
)?;
} else {
None => {
warn!(
target: LOG_TARGET,
"Empty 'BlockHeaderAccumulatedData' for parent hash '{}'",
parent_hash.to_hex()
);
},
}
},
(false, false) => {
// No entries, nothing here
},
_ => {
// Some previous database operations were not atomic
warn!(
target: LOG_TARGET,
"Empty 'BlockHeaderAccumulatedData' for parent hash '{}'",
"'orphans_db' ({}) and 'orphan_header_accumulated_data_db' ({}) out of sync, missing parent hash '{}' entry",
lmdb_exists(txn, &self.orphans_db, parent_hash.as_slice())?,
lmdb_exists(txn, &self.orphan_header_accumulated_data_db, parent_hash.as_slice())?,
parent_hash.to_hex()
);
}
} else {
warn!(
target: LOG_TARGET,
"'orphans_db' and 'orphan_header_accumulated_data_db' out of sync, missing parent hash '{}' entry",
parent_hash.to_hex()
);
},
}
}

Expand Down
Loading