[1.0] Limit sync-fetch-span by max-reversible-blocks if needed #545
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
heifner
changed the title
greg7mdp
requested changes
Aug 15, 2024
plugins/net_plugin/net_plugin.cpp
Outdated
| ,sync_state(in_sync) | ||
| ,min_blocks_distance(min_blocks_distance) | ||
| { | ||
| } | ||
|
|
||
| uint32_t sync_manager::active_sync_fetch_span() const { | ||
| auto fork_db_size = my_impl->chain_plug->chain().fork_db_size(); | ||
| auto reversible_remaining = max_reversible_blocks - fork_db_size; |
There was a problem hiding this comment.
We shutdown when fork_db_size() >= max_reversible_blocks, so really we should have:
Suggested change
| auto reversible_remaining = max_reversible_blocks - fork_db_size; | |
| auto reversible_remaining = max_reversible_blocks - fork_db_size - 1; |
I think.
There was a problem hiding this comment.
Do we need to check max_reversible_blocks > fork_db_size before doing subtract?
greg7mdp
reviewed
Aug 15, 2024
linh2931
approved these changes
Aug 16, 2024
greg7mdp
approved these changes
Aug 16, 2024
plugins/net_plugin/net_plugin.cpp
Outdated
| // block was not applied, possibly because we already have the block | ||
| fc_dlog(logger, "Requesting ${fs} blocks ahead, head: ${h} fhead ${fh} blk_num: ${bn} sync_next_expected_num ${nen} " | ||
| "sync_last_requested_num: ${lrn}, sync_last_requested_block: ${lrb}", | ||
| ("fs", fetch_span)("h", my_impl->get_chain_head_num())("fh", my_impl->get_fork_head_num()) |
There was a problem hiding this comment.
Suggested change
| ("fs", fetch_span)("h", my_impl->get_chain_head_num())("fh", my_impl->get_fork_head_num()) | |
| ("fs", fetch_span)("h", head)("fh", my_impl->get_fork_head_num()) |
|
Note:start |
This was referenced Aug 18, 2024
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.
Example output:
Resolves #528