[5.0] P2P: Throttle over sync window #1811
Merged
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
…rom time of connection. Updated test to use more reasonable values.
greg7mdp
approved these changes
Oct 24, 2023
linh2931
approved these changes
Oct 24, 2023
spoonincode
approved these changes
Oct 24, 2023
dimas1185
reviewed
Oct 24, 2023
plugins/net_plugin/net_plugin.cpp
Outdated
| @@ -892,6 +892,8 @@ namespace eosio { | |||
| std::atomic<size_t> bytes_sent{0}; | |||
| std::atomic<size_t> block_sync_bytes_received{0}; | |||
| std::atomic<size_t> block_sync_bytes_sent{0}; | |||
| std::chrono::nanoseconds block_sync_send_start{0ns}; // start of enqueue blocks | |||
| size_t block_sync_send_bytes_sent{0}; // bytes sent in this set of enqueue blocks | |||
There was a problem hiding this comment.
I hate to quibble over naming but block_sync_bytes_sent and block_sync_send_bytes_sent just blow my mind.
Can we rename this to something like:
block_sync_total_bytes_sent
block_sync_frame_bytes_sent ?
dimas1185
reviewed
Oct 24, 2023
plugins/net_plugin/net_plugin.cpp
Outdated
| if( block_sync_rate_limit > 0 && block_sync_send_bytes_sent > 0 && peer_syncing_from_us ) { | ||
| auto now = get_time(); | ||
| auto elapsed_us = std::chrono::duration_cast<std::chrono::microseconds>(now - block_sync_send_start); | ||
| double current_rate = (double(block_sync_bytes_sent) / elapsed_us.count()) * 100000; |
There was a problem hiding this comment.
If you are changing variables names from my comment above, please make this line a bit more readable by renaming current_rate to current_rate_sec or something like that. it will make it obvious that these are seconds and why you divide by 100'000. This is optional in case you are changing the code.
dimas1185
approved these changes
Oct 24, 2023
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.
Instead of calculating throttle limit from time of connection establishment, calculate over the specific enqueue sync window.
See #1741 for original implementation.
Update the throttle test to use more reasonable values.
Resolves #1808