Fix Concurrency Bug In CommitToParent #1320
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
dboehm-avalabs
commented
Apr 11, 2023
| @@ -222,10 +222,8 @@ func (t *trieView) calculateNodeIDs(ctx context.Context) error { | |||
|
|
|||
| // ensure that the view under this one is up-to-date before potentially pulling in nodes from it | |||
| // getting the Merkle root forces any unupdated nodes to recalculate their ids | |||
| if t.parentTrie != nil { | |||
There was a problem hiding this comment.
detects as race and no longer needed. Hold over from when views could have no parent view.
danlaine
reviewed
Apr 11, 2023
danlaine
reviewed
Apr 11, 2023
Co-authored-by: Dan Laine <daniel.laine@avalabs.org>
…alanchego into FixCommitToParentBug
dboehm-avalabs
commented
Apr 11, 2023
| t.db.commitLock.Lock() | ||
| defer t.db.commitLock.Unlock() | ||
| } | ||
| t.db.commitLock.Lock() |
There was a problem hiding this comment.
Prevents multiple commits from occurring at the same time until I can figure out a way to manage the safety of this.
danlaine
approved these changes
Apr 11, 2023
…alanchego into FixCommitToParentBug
darioush
approved these changes
Apr 11, 2023
abi87
pushed a commit
that referenced
this pull request
Apr 13, 2023
Co-authored-by: Dan Laine <daniel.laine@avalabs.org>
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.
CommitToParent can happen concurrently so it may cause the parent of a view to change during its own attempt to commit to its parent(see the new unit tests). This isn't an issue for CommitToDB as it uses the commit lock.