repair: fix forest to handle forks from non-frontier slots #4873
+87
−13
Conversation
This file contains hidden or 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
emwang-jump
force-pushed
the
emwang/forest-fork-fix
branch
from
12835a9 to
b02d033
Compare
lidatong
reviewed
Apr 25, 2025
| if( FD_UNLIKELY( !ele ) ) { | ||
| // traverse up the tree to see if we can find a parent | ||
| ele = fd_forest_ancestry_ele_query( ancestry, &slot, NULL, pool ); | ||
| ulong parent_idx = ele->parent; |
Comment on lines
+307
to
+309
| /* We hit this case when we are not on frontier, parent is not on | ||
| frontier, but grandparent is on frontier. Which means this data | ||
| shred will not be advancing the frontier. */ |
| @@ -284,6 +284,33 @@ advance_frontier( fd_forest_t * forest, ulong slot, ushort parent_off ) { | |||
| ulong parent_slot = slot - parent_off; | |||
| ele = fd_ptr_if( !ele, fd_forest_frontier_ele_query( fd_forest_frontier( forest ), &parent_slot, NULL, pool ), ele ); | |||
|
|
|||
| /* There's an edge case where a fork begins from from somewhere behind | |||
There was a problem hiding this comment.
hm... should this logic live in the insert helper function in forest instead?
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.
No description provided.