This repository has been archived by the owner on Oct 28, 2021. It is now read-only.
Resync pending state if needed before adding new transactions #4520
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
gumb0
commented
Sep 19, 2017
| @@ -659,7 +658,7 @@ void Client::doWork(bool _doWait) | |||
| bool isSealed = false; | |||
| DEV_READ_GUARDED(x_working) | |||
| isSealed = m_working.isSealed(); | |||
| if (!isSealed && !isSyncing() && !m_remoteWorking && m_syncTransactionQueue.compare_exchange_strong(t, false)) | |||
There was a problem hiding this comment.
This will make processing of pending transactions to start closer to sync finish.
(isSyncing() returns false when there are no more blocks to download, but there still may be many blocks to import in BlockQueue)
|
Wait, this leads to deadlock |
gumb0
force-pushed
the
fix-tq-sync-assert
branch
from
00dd23e
to
f5b3ddc
Compare
Codecov Report
@@ Coverage Diff @@
## develop #4520 +/- ##
===========================================
+ Coverage 63.15% 63.25% +0.09%
===========================================
Files 364 364
Lines 30413 30423 +10
Branches 2750 2752 +2
===========================================
+ Hits 19208 19243 +35
+ Misses 11022 10996 -26
- Partials 183 184 +1
Continue to review full report at Codecov.
|
chfast
approved these changes
Sep 20, 2017
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 should fix the assert happening during sync:
https://github.com/ethereum/cpp-ethereum/blob/develop/libethereum/Block.cpp#L326
It happened when
m_workinginClientis not up-to-date with the latest modifications toBlockChainand then we tried to import new transactions fromTransactionQueue