repair: fix forest and fec chainer publish edge cases #5519
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/fix-repair-publish
branch
from
1dcb5d6 to
893a2b5
Compare
emwang-jump
force-pushed
the
emwang/fix-repair-publish
branch
from
893a2b5 to
ee70fdb
Compare
lidatong
reviewed
Jul 10, 2025
| } | ||
| child = fd_forest_pool_ele( pool, child->sibling ); | ||
| } | ||
| ulong remove = fd_forest_orphaned_idx_remove( orphaned, &head->slot, null, pool ); /* remove myself */ |
There was a problem hiding this comment.
clear remove->next too in case there was a map collision (can lead to subtle bugs)
Suggested change
| ulong remove = fd_forest_orphaned_idx_remove( orphaned, &head->slot, null, pool ); /* remove myself */ | |
| fd_forest_ele_t * remove = fd_forest_orphaned_ele_remove( orphaned, &head->slot, null, pool ); | |
| remove->next = idx_null; |
There was a problem hiding this comment.
changed to deque for bfs
| fd_forest_ele_t * remove = fd_forest_ancestry_ele_remove( ancestry, &new_root_ele->slot, NULL, pool ); | ||
| if( FD_UNLIKELY( !remove ) ) { | ||
| /* Very rare case where during second incremental load we could publish to an orphaned slot */ | ||
| remove = fd_forest_orphaned_ele_remove( orphaned, &new_root_ele->slot, NULL, pool ); |
emwang-jump
force-pushed
the
emwang/fix-repair-publish
branch
3 times, most recently
from
4cf636a to
cc1cc9e
Compare
lidatong
reviewed
Jul 10, 2025
src/discof/forest/fd_forest.c
Outdated
| @@ -42,6 +42,7 @@ fd_forest_new( void * shmem, ulong ele_max, ulong seed ) { | |||
| void * ancestry = FD_SCRATCH_ALLOC_APPEND( l, fd_forest_ancestry_align(), fd_forest_ancestry_footprint( ele_max ) ); | |||
| void * frontier = FD_SCRATCH_ALLOC_APPEND( l, fd_forest_frontier_align(), fd_forest_frontier_footprint( ele_max ) ); | |||
| void * orphaned = FD_SCRATCH_ALLOC_APPEND( l, fd_forest_orphaned_align(), fd_forest_orphaned_footprint( ele_max ) ); | |||
| void * deque = FD_SCRATCH_ALLOC_APPEND( l, fd_forest_deque_align(), fd_forest_deque_footprint( ele_max ) ); | |||
There was a problem hiding this comment.
align footprint starting parens too
lidatong
reviewed
Jul 10, 2025
src/discof/forest/fd_forest.c
Outdated
| @@ -51,6 +52,7 @@ fd_forest_new( void * shmem, ulong ele_max, ulong seed ) { | |||
| forest->ancestry_gaddr = fd_wksp_gaddr_fast( wksp, fd_forest_ancestry_join( fd_forest_ancestry_new( ancestry, ele_max, seed ) ) ); | |||
| forest->frontier_gaddr = fd_wksp_gaddr_fast( wksp, fd_forest_frontier_join( fd_forest_frontier_new( frontier, ele_max, seed ) ) ); | |||
| forest->orphaned_gaddr = fd_wksp_gaddr_fast( wksp, fd_forest_orphaned_join( fd_forest_orphaned_new( orphaned, ele_max, seed ) ) ); | |||
| forest->deque_gaddr = fd_wksp_gaddr_fast( wksp, fd_forest_deque_join ( fd_forest_deque_new ( deque, ele_max ) ) ); | |||
emwang-jump
force-pushed
the
emwang/fix-repair-publish
branch
2 times, most recently
from
55600ed to
f79f332
Compare
emwang-jump
force-pushed
the
emwang/fix-repair-publish
branch
from
f79f332 to
5240701
Compare
lidatong
approved these changes
Jul 10, 2025
| ele = fd_ptr_if( !ele, fd_forest_frontier_ele_query( fd_forest_frontier( forest ), &slot, NULL, pool ), ele ); | ||
| return ele; | ||
| FD_FN_PURE static inline ulong * | ||
| fd_forest_deque( fd_forest_t * forest ) { |
src/discof/forest/fd_forest.h
Outdated
| FD_LAYOUT_INIT, | ||
| alignof(fd_forest_t), sizeof(fd_forest_t) ), | ||
| fd_fseq_align(), fd_fseq_footprint() ), | ||
| fd_forest_pool_align(), fd_forest_pool_footprint( ele_max ) ), | ||
| fd_forest_ancestry_align(), fd_forest_ancestry_footprint( ele_max ) ), | ||
| fd_forest_frontier_align(), fd_forest_frontier_footprint( ele_max ) ), | ||
| fd_forest_orphaned_align(), fd_forest_orphaned_footprint( ele_max ) ), | ||
| fd_forest_deque_align(), fd_forest_deque_footprint( ele_max ) ), |
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.
fixest publish edge cases specifically for second incremental loading