rpc: fix subscribers locking logic and properly drain poll-based waiter receiver #2804
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
Follow the other errors formatting style.
Make it more detailed for better debugging experience.
If it's a subscription for AERs, we need to check the filter's state only if it has been provided, otherwise filter is always valid.
AnnaShaleva
force-pushed
the
check-aer-sub
branch
from
b400770 to
72f8017
Compare
pkg/rpcclient/actor/waiter.go
Outdated
| // We can easily end up in a situation when subscription was performed too late and | ||
| // the desired transaction and VUB-th block have already got accepted before the | ||
| // subscription happened. Thus, always retry with non-ws client, it will perform | ||
| // AER requests and make sure. |
There was a problem hiding this comment.
Subscribe first, send afterwards? We need some issue for it.
AnnaShaleva
force-pushed
the
check-aer-sub
branch
from
72f8017 to
d218c78
Compare
|
There still some deadlock either in |
|
Found it, we need to rework the logic of |
Do not block subscribers until the unsubscription request to RPC server is completed. Otherwise, another notification may be received from the RPC server which will block the unsubscription process. At the same time, fix event-based waiter. We must not block the receiver channel during unsubscription because there's a chance that subsequent event will be sent by the server. We need to read this event in order not to block the WSClient's readloop.
If VUB-th block is received, we still can't guaranty that transaction wasn't accepted to chain. Back this situation by rolling back to a poll-based waiter.
AnnaShaleva
force-pushed
the
check-aer-sub
branch
2 times, most recently
from
54336cf to
3588ad5
Compare
Avoid receiver channels locks.
AnnaShaleva
force-pushed
the
check-aer-sub
branch
from
3588ad5 to
1399496
Compare
|
OK, it should work properly now, the test is also fixed. |
Codecov Report
@@ Coverage Diff @@
## master #2804 +/- ##
==========================================
+ Coverage 84.75% 84.77% +0.01%
==========================================
Files 327 327
Lines 41368 41390 +22
==========================================
+ Hits 35062 35088 +26
+ Misses 4876 4869 -7
- Partials 1430 1433 +3
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
roman-khimov
approved these changes
Nov 16, 2022
There was a problem hiding this comment.
The main thing for now is that it fixes #2775. Waiter has a bit more chances now too.
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.
Close #2775.
@roman-khimov, it's a bingo...