Fix ws halt #6981
Merged
Fix ws halt #6981
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
Signed-off-by: Karim Taam <karim.t2am@gmail.com>
Signed-off-by: Karim Taam <karim.t2am@gmail.com>
Signed-off-by: Karim Taam <karim.t2am@gmail.com>
…uilder as it's no longer needed Signed-off-by: Jason Frame <jason.frame@consensys.net>
macfarla
approved these changes
Apr 23, 2024
...reum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/CompleteTaskStep.java
Outdated
Show resolved
Hide resolved
| @@ -111,7 +110,9 @@ public SnapWorldDownloadState( | |||
| this.blockchain = blockchain; | |||
| this.snapSyncState = snapSyncState; | |||
| this.metricsManager = metricsManager; | |||
| this.blockObserverId = OptionalLong.empty(); | |||
| this.blockObserverId = blockchain.observeBlockAdded(createBlockchainObserver()); | |||
There was a problem hiding this comment.
nit - can the comment below go before this line
There was a problem hiding this comment.
or delete - it's not really adding anything, the line of code says the same thing
There was a problem hiding this comment.
Done. Removed it. Don't think it was adding anything
| @@ -441,8 +437,7 @@ public BlockAddedObserver createBlockchainObserver() { | |||
| final boolean isBlockchainCaughtUp = | |||
| snapSyncState.isWaitingBlockchain() && !pivotBlockSelector.isBlockchainBehind(); | |||
|
|
|||
| if (isNewPivotBlockFound | |||
| || isBlockchainCaughtUp) { // restart heal if we found a new pivot block or if close to | |||
| if (snapSyncState.isHealTrieInProgress() && (isNewPivotBlockFound || isBlockchainCaughtUp)) { | |||
| // head again | |||
There was a problem hiding this comment.
the rest of this comment has been deleted - doesn't make sense by itself
There was a problem hiding this comment.
Done. Removed it, don't think we need the comment
…ync/snapsync/CompleteTaskStep.java Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: Jason Frame <jasonwframe@gmail.com>
Signed-off-by: Jason Frame <jason.frame@consensys.net>
Signed-off-by: Jason Frame <jason.frame@consensys.net>
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.
PR description
PR created on behalf of @matkt https://github.com/matkt/besu/tree/feature/try-fix-ws-halt branch.
It fixes a possible halting of the worldstate download during the initial sync.
Testing
Fixed Issue(s)
Fixes #6908
Thanks for sending a pull request! Have you done the following?
doc-change-requiredlabel to this PR if updates are required.Locally, you can run these tests to catch failures early:
./gradlew build./gradlew acceptanceTest./gradlew integrationTest./gradlew ethereum:referenceTests:referenceTests