fix(network): tune block sync throughput defaults#289
Merged
p0mvn merged 7 commits intoJun 27, 2026
Conversation
evan-forbes
force-pushed
the
review/blocksync-throughput-defaults
branch
from
June 27, 2026 04:56
9750926 to
d417114
Compare
evan-forbes
force-pushed
the
review/blocksync-congestion-control
branch
from
June 27, 2026 04:56
4119bd9 to
b06c085
Compare
evan-forbes
force-pushed
the
review/blocksync-throughput-defaults
branch
from
June 27, 2026 05:01
d417114 to
46378b2
Compare
evan-forbes
force-pushed
the
review/blocksync-congestion-control
branch
from
June 27, 2026 05:01
b06c085 to
18eac76
Compare
evan-forbes
force-pushed
the
review/blocksync-congestion-control
branch
from
June 27, 2026 08:18
18eac76 to
a7e79f3
Compare
evan-forbes
force-pushed
the
review/blocksync-throughput-defaults
branch
from
June 27, 2026 08:18
46378b2 to
8b47dd3
Compare
evan-forbes
marked this pull request as ready for review
June 27, 2026 08:27
… config The throughput-defaults rc.4 golden config dropped the [consensus] disable_vct_fast_sync field, so the generated default config no longer matched any stored config and last_config_is_stored (config_tests) failed once the build break was fixed and the test could run.
evan-forbes
commented
Jun 27, 2026
|
|
||
| [consensus] | ||
| checkpoint_sync = true | ||
| disable_vct_fast_sync = false |
Author
There was a problem hiding this comment.
seems fine for the test failure, but ofc I have less context here
also in a future pr, we could change this to avoid a double negative I think. we could just have the default be
vct_fast_sync = true
Author
There was a problem hiding this comment.
happy to add this to the flups at the end if reviewers agree
7 tasks
|
Merging main branch into this |
p0mvn
changed the base branch from
review/blocksync-congestion-control
to
feat/pre-release-main
June 27, 2026 20:20
p0mvn
approved these changes
Jun 27, 2026
p0mvn
left a comment
p0mvn
left a comment
There was a problem hiding this comment.
This is more of a utACK. As I've mentioned on Slack, I think I will need to test more on mainnet to grasp the inter-dependencies and impact of the params
6 tasks
evan-forbes
added a commit
that referenced
this pull request
Jun 28, 2026
Follow-ups from review of the merged block-sync throughput stack (#284, #286, #287, #288, #289): - sequencer: drop the redundant 500ms timer-driven floor-starvation shed. Floor rescue is already demand-driven (inline after each accepted body, plus the synchronous FundFloorReservation path), so the periodic backstop was a pure fixed-cadence poll. - reactor: make the floor watchdog event-driven. Arm a sleep to the earliest outstanding floor-claim deadline instead of polling on a fixed tick, mirroring the per-peer routine's own-timeout arm. Removes the floor_watchdog_tick config knob. - consensus/state: rename consensus.disable_vct_fast_sync -> consensus.vct_fast_sync (default true) to remove the double negative. Mirror updated in state config, docs, and CHANGELOG. - work_queue: debug_assert the take_in_range_budgeted precondition (positive count, low <= high) instead of silently returning empty. - block_sync: reword refactor-historical comments ("ported from", "verbatim", "matches the previous", "used to") to describe current behavior. AI-assisted: implemented with Claude Code (Opus 4.8).
p0mvn
pushed a commit
that referenced
this pull request
Jun 28, 2026
Follow-ups from review of the merged block-sync throughput stack (#284, #286, #287, #288, #289): - sequencer: drop the redundant 500ms timer-driven floor-starvation shed. Floor rescue is already demand-driven (inline after each accepted body, plus the synchronous FundFloorReservation path), so the periodic backstop was a pure fixed-cadence poll. - reactor: make the floor watchdog event-driven. Arm a sleep to the earliest outstanding floor-claim deadline instead of polling on a fixed tick, mirroring the per-peer routine's own-timeout arm. Removes the floor_watchdog_tick config knob. - consensus/state: rename consensus.disable_vct_fast_sync -> consensus.vct_fast_sync (default true) to remove the double negative. Mirror updated in state config, docs, and CHANGELOG. - work_queue: debug_assert the take_in_range_budgeted precondition (positive count, low <= high) instead of silently returning empty. - block_sync: reword refactor-historical comments ("ported from", "verbatim", "matches the previous", "used to") to describe current behavior. AI-assisted: implemented with Claude Code (Opus 4.8).
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Motivation
This is the sixth block-sync PR in the stack. After the scheduling, backlog, floor-priority, and congestion mechanics are in place, this tunes the defaults and config fixture to the combined block-sync behavior.
Solution
v5.0.0-rc.4.tomlconfig fixture with the current serializable Zakura block-sync defaults.Scope boundary:
Tests
Passed locally on the rebuilt split stack:
git diff --check origin/review/headersync-roots..review/blocksync-throughput-defaultscargo fmt --all -- --checkcargo test -p zebra-network zakura::block_sync --lib(146 passedon the final stack tip)cargo test -p zebra-network block_sync_config_defaults_and_round_trips -- --nocaptureAttempted but blocked by the local toolchain before test execution:
cargo test -p zebrad --test acceptance latest_config_is_stored -- --nocapturelibrocksdb-sysC++ compilation fails on RocksDB headers usinguint64_twithout<cstdint>.Note: the final split stack intentionally differs from the backed-up original all-in-one branch by the review fixes made after the split: advertised size hints are read by #284, raw backlog retention avoids re-decoding the immediate contiguous path in #286, #288 validates block-sync config during deserialization, and this PR refreshes the generated config fixture.
Specifications & References
Stack context:
review/blocksync-congestion-controlFollow-up Work
The apply/committer ownership refactor and commit-bench/tooling remain separate follow-up PRs.
AI Disclosure
PR Checklist
type(scope): description