Fix overwriting of atomic trie roots #407
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
StephenButtolph
approved these changes
Dec 1, 2023
patrick-ogrady
approved these changes
Dec 1, 2023
StephenButtolph
changed the title
StephenButtolph
changed the title
joshua-kim
added a commit
that referenced
this pull request
Dec 6, 2023
commit abde8d6 Author: Stephen Buttolph <stephen@avalabs.org> Date: Wed Dec 6 13:39:32 2023 -0500 Update avalanchego dependency to v1.10.18-rc.0 (#415) commit bed4cf7 Author: Stephen Buttolph <stephen@avalabs.org> Date: Fri Dec 1 16:48:28 2023 -0500 Clarify bonus block inclusion in atomic trie (#412) commit 631a5bd Author: Darioush Jalali <darioush.jalali@avalabs.org> Date: Fri Dec 1 13:33:07 2023 -0800 Fix trie reuse after Commit in atomic sync (#411) Co-authored-by: aaronbuchwald <aaron.buchwald56@gmail.com> Co-authored-by: Stephen Buttolph <stephen@avalabs.org> commit 6d7e6b8 Author: Darioush Jalali <darioush.jalali@avalabs.org> Date: Fri Dec 1 12:39:07 2023 -0800 Fix overwriting of atomic trie roots (#407) commit 0a6a7a3 Author: Darioush Jalali <darioush.jalali@avalabs.org> Date: Fri Dec 1 12:09:32 2023 -0800 Skip bonus blocks applying atomic ops from trie to shared memory (#409) commit 0eef20a Author: Stephen Buttolph <stephen@avalabs.org> Date: Fri Dec 1 13:21:45 2023 -0500 Improve logging of unexpected state sync errors (#410) commit f6899f9 Author: Stephen Buttolph <stephen@avalabs.org> Date: Fri Dec 1 13:10:26 2023 -0500 Simplify atomic root acceptance (#406) Co-authored-by: aaronbuchwald <aaron.buchwald56@gmail.com> commit 8e388ba Author: Joshua Kim <20001595+joshua-kim@users.noreply.github.com> Date: Wed Nov 29 20:45:05 2023 -0500 Use `p2p.Network` (#384) Signed-off-by: Joshua Kim <20001595+joshua-kim@users.noreply.github.com>
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.
Why this should be merged
Existing logic is querying the atomic trie for the last committed, then using that to determine whether or not new keys received in syncing should create a new commit.
This results in incorrect metadata (height --> root mapping) to be stored, as when a key with height > lastCommitted is received, it can create an additional commit at the previous height.
How this works
Maintains the lastHeight the syncer has fully added to the trie.
How this was tested
CI, regression test