fix: don't panic if new flat head is not reachable #7724
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mzhangmzz
reviewed
Sep 29, 2022
|
@mzhangmzz moved heights comparison inside |
mzhangmzz
approved these changes
Oct 2, 2022
core/store/src/flat_state.rs
Outdated
| }; | ||
| // If new head height is not greater than current head height, new head is not a child of flat head, so we | ||
| // return Ok. | ||
| if new_head_height <= current_head_height { |
There was a problem hiding this comment.
Actually I wonder if it's cleaner to not change this function and check at the its callsite to ignore the "BlockNotFoundError". A lot of the checks you did here is included at get_deltas_between_blocks
There was a problem hiding this comment.
Yeah, I agree. If get_deltas_between_blocks fails, then new code fails as well.
Longarithm
changed the title
nikurt
pushed a commit
that referenced
this pull request
Nov 9, 2022
In `tests::client::process_blocks::test_query_final_state`, there is a chain with two forks: ``` /// /-------> 6 /// 1 -> 2 -> 3 -> 4 /// \---> 5 ``` When (5) is postprocessed, flat head moves from (2) to (3). When then (6) is postprocessed, the last final block it sees is (2). It attempts to move flat head from (3) to (2) and the node crashes. Also we can't simply take final head which always moves forward, due to catchups. So we add comparison of old and new heights. ## Testing https://buildkite.com/nearprotocol/nearcore-flat-state/builds/62#01838983-7f4d-4bd1-9eea-a376da2e0a62
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In
tests::client::process_blocks::test_query_final_state, there is a chain with two forks:When (5) is postprocessed, flat head moves from (2) to (3).
When then (6) is postprocessed, the last final block it sees is (2). It attempts to move flat head from (3) to (2) and the node crashes.
Also we can't simply take final head which always moves forward, due to catchups. So we add comparison of old and new heights.
Testing
https://buildkite.com/nearprotocol/nearcore-flat-state/builds/62#01838983-7f4d-4bd1-9eea-a376da2e0a62