fix: fix new block handling of non-tip blocks #4431
Merged
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
delta1
reviewed
Aug 10, 2022
SWvheerden
force-pushed
the
sw_fix_orphan_handling
branch
from
4929a78
to
9b10919
Compare
sdbondi
reviewed
Aug 10, 2022
| error!(target: LOG_TARGET, "Failed to handle incoming block message: {:?}", e); | ||
| match result { | ||
| Err(BaseNodeServiceError::CommsInterfaceError(CommsInterfaceError::ChainStorageError( | ||
| ChainStorageError::CannotAcquireFileLock, |
There was a problem hiding this comment.
This error only happens when you startup a node with the same base dir - the db lockfile is present.
Cannot acquire exclusive file lock, another instance of the application is already running
Which error message are you trying to suppress?
There was a problem hiding this comment.
good catch, wrong error.
sdbondi
reviewed
Aug 10, 2022
SWvheerden
force-pushed
the
sw_fix_orphan_handling
branch
2 times, most recently
from
26c7cc9
to
ded0584
Compare
SWvheerden
force-pushed
the
sw_fix_orphan_handling
branch
from
ded0584
to
d27fa3e
Compare
stringhandler
changed the title
stringhandler
approved these changes
Aug 10, 2022
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.
Description
Currently, the base node cannot process a block that was received out of order (aka orphaned).
The
reconcile_blockfunction makes the assumption that the block is always on the current tip and tries to calculate the MMR roots of the block as a sanity check. The MMR roots can only be checked by a block that is built on the current local tip.This changes the
reconcile_blockfunction to first check orphan status, and if true, it will require the full block from the peer.This Pr also changes how the db lock is processed. Currently, it will print out a warn followed by an error. This suppresses the error and only prints the warn.
How Has This Been Tested?
Manual
Fixes: #4352