Skip to content

perf(consensus/blockstore): Remove validate basic call from LoadBlockMeta (backport #2964)#2998

Merged
melekes merged 2 commits intov0.37.xfrom
mergify/bp/v0.37.x/pr-2964
May 3, 2024
Merged

perf(consensus/blockstore): Remove validate basic call from LoadBlockMeta (backport #2964)#2998
melekes merged 2 commits intov0.37.xfrom
mergify/bp/v0.37.x/pr-2964

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented May 3, 2024

Our gossip block parts routine calls Blockstore.LoadBlockMeta (as do things in blocksync). This currently takes some time due to ValidateBasic:
image

However note that we only save validated data to the blockstore. We only do it in:

Hence the validate basic time is wasted.

This should eventually just go to an LRU cache to even avoid the proto unmarshalling (as should ~everything in blockstore) but we want this anyway to reduce the computational overhead,

WRT live consensus, in main this only helps with catchup for live syncing nodes, I haven't checked on v0.47.x, but the cpuprofile suggests it may help with active block gossip time as well?


PR checklist

  • Tests written/updated
  • Changelog entry added in .changelog (we use unclog to manage our changelog)
  • Updated relevant documentation (docs/ or spec/) and code comments
  • Title follows the Conventional Commits spec

This is an automatic backport of pull request #2964 done by [Mergify](https://mergify.com).

…Meta (#2964)

<!--

Please add a reference to the issue that this PR addresses and indicate
which
files are most critical to review. If it fully addresses a particular
issue,
please include "Closes #XXX" (where "XXX" is the issue number).

If this PR is non-trivial/large/complex, please ensure that you have
either
created an issue that the team's had a chance to respond to, or had some
discussion with the team prior to submitting substantial pull requests.
The team
can be reached via GitHub Discussions or the Cosmos Network Discord
server in
the #cometbft channel. GitHub Discussions is preferred over Discord as
it
allows us to keep track of conversations topically.
https://github.com/cometbft/cometbft/discussions

If the work in this PR is not aligned with the team's current
priorities, please
be advised that it may take some time before it is merged - especially
if it has
not yet been discussed with the team.

See the project board for the team's current priorities:
https://github.com/orgs/cometbft/projects/1

-->

Our gossip block parts routine calls `Blockstore.LoadBlockMeta` (as do
things in blocksync). This currently takes some time due to
ValidateBasic:

![image](https://github.com/cometbft/cometbft/assets/6440154/2f4471b0-0744-44de-ab94-4a9a4596712c)

However note that we only save validated data to the blockstore. We only
do it in:
- Commit:
https://github.com/cometbft/cometbft/blob/main/internal/consensus/state.go#L1867
- Blocksync after validation:
https://github.com/cometbft/cometbft/blob/main/internal/consensus/state.go#L1867

Hence the validate basic time is wasted.

This should eventually just go to an LRU cache to even avoid the proto
unmarshalling (as should ~everything in blockstore) but we want this
anyway to reduce the computational overhead,

WRT live consensus, in main this only helps with catchup for live
syncing nodes, I haven't checked on v0.47.x, but the cpuprofile suggests
it may help with active block gossip time as well?

---

#### PR checklist

- [x] Tests written/updated
- [x] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [x] Updated relevant documentation (`docs/` or `spec/`) and code
comments
- [x] Title follows the [Conventional
Commits](https://www.conventionalcommits.org/en/v1.0.0/) spec

(cherry picked from commit 5601db6)

# Conflicts:
#	store/store.go
@mergify mergify bot requested a review from a team as a code owner May 3, 2024 12:17
@mergify mergify bot added the conflicts label May 3, 2024
@mergify
Copy link
Contributor Author

mergify bot commented May 3, 2024

Cherry-pick of 5601db6 has failed:

On branch mergify/bp/v0.37.x/pr-2964
Your branch is up to date with 'origin/v0.37.x'.

You are currently cherry-picking commit 5601db6c4.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   .changelog/unreleased/improvements/2964-skip-revalidation-of-blockstore-LoadBlockFromMeta-.md
	modified:   types/block_meta.go
	modified:   types/block_meta_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   store/store.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@melekes melekes merged commit 47d7d38 into v0.37.x May 3, 2024
@melekes melekes deleted the mergify/bp/v0.37.x/pr-2964 branch May 3, 2024 12:30
ValarDragon added a commit to osmosis-labs/cometbft that referenced this pull request May 4, 2024
…Meta (backport cometbft#2964) (cometbft#2998)

Our gossip block parts routine calls `Blockstore.LoadBlockMeta` (as do
things in blocksync). This currently takes some time due to
ValidateBasic:

![image](https://github.com/cometbft/cometbft/assets/6440154/2f4471b0-0744-44de-ab94-4a9a4596712c)

However note that we only save validated data to the blockstore. We only
do it in:
- Commit:
https://github.com/cometbft/cometbft/blob/main/internal/consensus/state.go#L1867
- Blocksync after validation:
https://github.com/cometbft/cometbft/blob/main/internal/consensus/state.go#L1867

Hence the validate basic time is wasted.

This should eventually just go to an LRU cache to even avoid the proto
unmarshalling (as should ~everything in blockstore) but we want this
anyway to reduce the computational overhead,

WRT live consensus, in main this only helps with catchup for live
syncing nodes, I haven't checked on v0.47.x, but the cpuprofile suggests
it may help with active block gossip time as well?

---

#### PR checklist

- [x] Tests written/updated
- [x] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [x] Updated relevant documentation (`docs/` or `spec/`) and code
comments
- [x] Title follows the [Conventional
Commits](https://www.conventionalcommits.org/en/v1.0.0/) spec
<hr>This is an automatic backport of pull request cometbft#2964 done by
[Mergify](https://mergify.com).

---------

Co-authored-by: Dev Ojha <ValarDragon@users.noreply.github.com>
Co-authored-by: Anton Kaliaev <anton.kalyaev@gmail.com>
ValarDragon added a commit to osmosis-labs/cometbft that referenced this pull request May 7, 2024
…Meta (backport cometbft#2964) (cometbft#2998)

Our gossip block parts routine calls `Blockstore.LoadBlockMeta` (as do
things in blocksync). This currently takes some time due to
ValidateBasic:

![image](https://github.com/cometbft/cometbft/assets/6440154/2f4471b0-0744-44de-ab94-4a9a4596712c)

However note that we only save validated data to the blockstore. We only
do it in:
- Commit:
https://github.com/cometbft/cometbft/blob/main/internal/consensus/state.go#L1867
- Blocksync after validation:
https://github.com/cometbft/cometbft/blob/main/internal/consensus/state.go#L1867

Hence the validate basic time is wasted.

This should eventually just go to an LRU cache to even avoid the proto
unmarshalling (as should ~everything in blockstore) but we want this
anyway to reduce the computational overhead,

WRT live consensus, in main this only helps with catchup for live
syncing nodes, I haven't checked on v0.47.x, but the cpuprofile suggests
it may help with active block gossip time as well?

---

#### PR checklist

- [x] Tests written/updated
- [x] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [x] Updated relevant documentation (`docs/` or `spec/`) and code
comments
- [x] Title follows the [Conventional
Commits](https://www.conventionalcommits.org/en/v1.0.0/) spec
<hr>This is an automatic backport of pull request cometbft#2964 done by
[Mergify](https://mergify.com).

---------

Co-authored-by: Dev Ojha <ValarDragon@users.noreply.github.com>
Co-authored-by: Anton Kaliaev <anton.kalyaev@gmail.com>
PaddyMc pushed a commit to osmosis-labs/cometbft that referenced this pull request May 22, 2024
…Meta (backport cometbft#2964) (cometbft#2998) (#62)

* perf(consensus/blockstore): Remove validate basic call from LoadBlockMeta (cometbft#2998) (#62)

Co-authored-by: Anton Kaliaev <anton.kalyaev@gmail.com>
mergify bot pushed a commit to osmosis-labs/cometbft that referenced this pull request May 22, 2024
…Meta (backport cometbft#2964) (cometbft#2998) (#62)

* perf(consensus/blockstore): Remove validate basic call from LoadBlockMeta (cometbft#2998) (#62)

Co-authored-by: Anton Kaliaev <anton.kalyaev@gmail.com>
(cherry picked from commit c73455f)
PaddyMc pushed a commit to osmosis-labs/cometbft that referenced this pull request May 23, 2024
…Meta (backport cometbft#2964) (cometbft#2998) (#62) (#66)

* perf(consensus/blockstore): Remove validate basic call from LoadBlockMeta (cometbft#2998) (#62)

Co-authored-by: Anton Kaliaev <anton.kalyaev@gmail.com>
(cherry picked from commit c73455f)

Co-authored-by: Dev Ojha <ValarDragon@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants