fix(state sync): handle expected_peer_id correctly #12267
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
saketh-are
commented
Oct 19, 2024
| if request | ||
| .peer_id | ||
| .as_ref() | ||
| .is_some_and(|expecting_peer_id| expecting_peer_id == &peer_id) |
There was a problem hiding this comment.
The heart of this change is essentially replacing this is_some_and with is_none_or. However, is_none_or is still unstable in rust version 1.81.0 so I had to reorganize things a bit.
saketh-are
commented
Oct 19, 2024
| } | ||
|
|
||
| let Some(request) = self.pending_requests.get(&key) else { | ||
| tracing::debug!(target: "sync", "Received {:?} expecting {:?}", key, self.pending_requests.keys()); |
There was a problem hiding this comment.
Think it should be OK to debug log all the pending keys since the limit is fairly low (10).
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #12267 +/- ##
==========================================
+ Coverage 71.65% 71.66% +0.01%
==========================================
Files 836 836
Lines 167176 167177 +1
Branches 167176 167177 +1
==========================================
+ Hits 119788 119813 +25
+ Misses 42163 42135 -28
- Partials 5225 5229 +4
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
robin-near
approved these changes
Oct 21, 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.
If the expected sender is not specified, we should accept a response from any peer. We don't specify an expected sender for state parts, so this bug meant that state sync was ignoring all parts received from peers.
#12247 adds tests which cover this code and detect this problem.