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

Avoid updating the block gap when it's unchanged #5540

Merged
merged 5 commits into from
Sep 4, 2024
Merged

Avoid updating the block gap when it's unchanged #5540

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bde7609
Avoid updating the block gap when it's unchanged
liuchengxu Sep 1, 2024
f2a260b
Make format strings more consistent within this file
liuchengxu Sep 1, 2024
e977dd5
Only update the block gap state when it's changed
liuchengxu Sep 1, 2024
335ac51
Add prdoc
liuchengxu Sep 1, 2024
79c5e6f
Merge branch 'master' into avoid-updating-block-gap-when-unchanged
davxy Sep 4, 2024
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
26 changes: 13 additions & 13 deletions substrate/client/db/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1693,19 +1693,19 @@ impl<Block: BlockT> Backend<Block> {
number,
hash,
)?;
}
if start > end {
transaction.remove(columns::META, meta_keys::BLOCK_GAP);
block_gap = None;
debug!(target: "db", "Removed block gap.");
} else {
block_gap = Some((start, end));
debug!(target: "db", "Update block gap. {:?}", block_gap);
transaction.set(
columns::META,
meta_keys::BLOCK_GAP,
&(start, end).encode(),
);
if start > end {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure the block gap can't be updated externally and returned from self.blockchain.meta.read()?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I'm pretty sure that update_block_gap() is the only way to update the gap in meta and it's only invoked at the end of try_commit_operation().

transaction.remove(columns::META, meta_keys::BLOCK_GAP);
block_gap = None;
debug!(target: "db", "Removed block gap.");
} else {
block_gap = Some((start, end));
debug!(target: "db", "Update block gap. {:?}", block_gap);
transaction.set(
columns::META,
meta_keys::BLOCK_GAP,
&(start, end).encode(),
);
}
}
} else if number > best_num + One::one() &&
number > One::one() && self.blockchain.header(parent_hash)?.is_none()
Expand Down