Fix/net slow lock #2266
Merged
Fix/net slow lock #2266
+463
−235
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
…p thread and into the relayer thread
…roblocks, but can read an existing trie
…ing trie, so handle as a 404
…ie that can disappear)
… thread, and have the relay thread pass back the list of unconfirmed transactions to the p2p thread so it can service requests to them via the RPC interface
kantai
reviewed
Jan 5, 2021
kantai
reviewed
Jan 5, 2021
kantai
approved these changes
Jan 5, 2021
|
It passes locally at least. |
|
Flaky tests pass locally. |
|
This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This PR addresses #2258 by moving management of unconfirmed state and microblock mining back into the relayer thread (now that it's safe to do this).
The p2p thread will drive microblock mining using a
RunMicroblockTenurerelayer directive, which will be sent to wake up the relayer every so often to mine the next microblock (according to the microblock interval from the config file).The p2p thread can no longer manage the unconfirmed state trie on its own, so I modified the
UnconfirmedStatestruct to have a "read-only" mode that will allow it to be used to query an existing trie in the underlying MARF. To make this happen safely, I also added a new Clarity API methodbegin_read_only_checked(), which unlikebegin_read_only()can fail if, for example, the given trie doesn't exist. This is necessary because the relayer thread can delete the unconfirmed trie while the p2p thread is using it to service requests; these requests should fail gracefully if this happens.Because the p2p thread needs to know which transactions went into the unconfirmed state trie (so it can handle
/v2/transactions/unconfirmed/{:txid}), I took the path of least resistance and made it so that the relay thread will share a copy of its unconfirmed state's mined transaction list with the p2p thread via a mutex guard. It's not the prettiest solution, but it requires fewer lines of code an introduces fewer failure modes than the alternatives I could think of.