Fix CGC backfill race condition #8267
Open
+103
−91
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
eserilev
added
bug
6 tasks
|
Updated the target branch to |
eserilev
added
ready-for-review
eserilev
commented
Oct 28, 2025
| // This should verify that a data column sidecar associated to a block root that doesn't exist in the store cannot | ||
| // be imported. | ||
| #[tokio::test] | ||
| async fn test_import_historical_data_columns_batch_no_block_found() { |
There was a problem hiding this comment.
this was a redundant test case
jimmygchen
reviewed
Oct 30, 2025
| let store = get_store_generic(&db_path, StoreConfig::default(), spec); | ||
| let start_slot = Epoch::new(0).start_slot(E::slots_per_epoch()) + 1; | ||
| let end_slot = Epoch::new(0).end_slot(E::slots_per_epoch()); | ||
| let cgc = 128; |
There was a problem hiding this comment.
nit: could use either E::number_of_columns or harness.chain.data_availability_checker.custody_context().custody_group_count_at_head(&sepc) instead.
jimmygchen
reviewed
Oct 30, 2025
| .forwards_iter_block_roots_until(start_slot, end_slot) | ||
| .unwrap(); | ||
|
|
||
| // Assert that data columns now exist for epoch 0 |
There was a problem hiding this comment.
Nice, these comments help! Thanks
jimmygchen
reviewed
Oct 30, 2025
| let store = get_store_generic(&db_path, StoreConfig::default(), spec); | ||
| let start_slot = Slot::new(1); | ||
| let end_slot = Slot::new(E::slots_per_epoch() * 2 - 1); | ||
| let cgc = 128; |
jimmygchen
approved these changes
Oct 30, 2025
jimmygchen
added
waiting-on-author
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Issue Addressed
During custody backfill sync there could be an edge case where we update CGC at the same time where we are importing a batch of columns which may cause us to incorrectly overwrite values when calling
backfill_validator_custody_requirements. To prevent this race condition, the expected cgc is now passed into this function and is used to check if the expected cgc == the current validator cgc. If the values arent equal, this probably indicates that a very recent CGC occurred so we do not prune/update values in theepoch_validator_custody_requirementsmap.