make unregister functions non-blocking #3526
Merged
+106
−1,196
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
coot
added
networking
connection-manager
bolt12
requested changes
Dec 6, 2021
ouroboros-network-framework/src/Ouroboros/Network/ConnectionManager/Core.hs
Outdated
Show resolved
Hide resolved
ouroboros-network-framework/src/Ouroboros/Network/ConnectionManager/Core.hs
Show resolved
Hide resolved
Also fix connection manager simulation. The simulation environment should not kill the connection thread with an asynchronous exception when the connection handler throws an exception.
The generators are tricky to maintain, since they need to predict the timeline of events to make sure that socket imposed semantics is preserved (e.g. there's no inbound connection while an inbound connection is active). On the other side, the server tests are mature enough to replace the property (the `prop_connectionManagerSimulation` predates simulated snocket).
Make sure that the wait time timeouts takes 'cmTimeWaitTimeout' seconds, even if an async exception is delivered during it. At the same time, it must not block async exceptions, to avoid `unregisterInboundConnection` (or `unregisterOutboundConnection`) being blocked for its duration.
* start the thread with masked exceptions (`asyncWithUnmask`, does not masks exceptions!) * remove not needed `uninterruptibleMask_`, since the exceptions are already uninterruptibly masked.
`demotedToColdRemote` can be executed when the connection is in `TerminatedState` (while pruning: see https://github.com/input-output-hk/ouroboros-network/runs/4408176265?check_suite_focus=true). In this test, while `AsyncException` propagates through mux threads, we managed to be notified about a last terminating mini-protocol, which triggered 'WaitIdleRemote' before 'MuxFinished' in the inbound governor. As a fix, we return now 'TerminatedConnection' and let the inbound governor remove the peer from its state without waiting on the mux notification.
coot
force-pushed
the
coot/cm-fix-blocking-unregister
branch
from
3c7d323 to
f5e14cc
Compare
|
I removed the connection-manager: added transition tracer, to avoid modification of traces, this currently causes problems for merging the new tracing system. |
bolt12
approved these changes
Dec 6, 2021
|
Maybe this will fix my timeout enforced tests |
|
bors merge |
|
Build succeeded: |
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.
connection-manager: added transition tracer