fix(tx-fetcher): only remove peer from active_peers when inflight_count <= 0 #6928
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
Signed-off-by: int88 <golden-miner@qq.com>
mattsse
added
C-bug
emhane
requested changes
Mar 2, 2024
There was a problem hiding this comment.
nice find! this hasn't been a problem now, since DEFAULT_MAX_COUNT_CONCURRENT_REQUESTS_PER_PEER is 1. hence when a request resolves, the peer should indeed always be removed from active peers. but, the code isn't future proof for when we make the max count configurable.
please when you find a bug like this, add a test in the pr that fixes it to cover the buggy code.
thanks!
| @@ -90,10 +90,10 @@ impl TransactionFetcher { | |||
| fn decrement_inflight_request_count_for(&mut self, peer_id: &PeerId) { | |||
| let remove = || -> bool { | |||
| if let Some(inflight_count) = self.active_peers.get(peer_id) { | |||
| if *inflight_count <= DEFAULT_MAX_COUNT_CONCURRENT_REQUESTS_PER_PEER { | |||
| *inflight_count -= 1; | |||
There was a problem hiding this comment.
Suggested change
| *inflight_count -= 1; | |
| *inflight_count.saturating_sub(1); |
better safe than sorry
There was a problem hiding this comment.
i'm a proponent of using checked methods in case of unintended behavior such as this, thoughts?
will do :) |
|
@emhane updated :) |
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.
fix logic error of
decrement_inflight_request_count_for.