Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor fork database #347

Merged
merged 32 commits into from
Jul 10, 2024
Merged

Refactor fork database #347

merged 32 commits into from
Jul 10, 2024

Conversation

heifner
Copy link
Member

@heifner heifner commented Jul 9, 2024 •
edited
Loading

  • Remove distinction between fork database pending_head and head
    • head() is now the old pending_head()
    • Track pending head as the head of the fork database best branch index
  • Remove valid as consideration of best fork
    • Set block state valid outside of fork database
    • Remove mark_valid() method and mark_valid_t arg of add()
    • Remove rollback_head_to_root() as block state is_valid() is no longer part of what fork database tracks
  • Persist if_irreversible_block_id in fork database as pending_savanna_lib_id
  • Add pending_lib_id() method to fork database
  • Rename conroller set_if_irreversible_block_id to set_savanna_lib_id
  • Remove fork_db_head_or_pending() from controller and use explicit calls to irreversible_mode() where needed

Developer note: fork database file format changed, restart from snapshot will be required

Resolves #333

heifner added 24 commits July 3, 2024 13:26
@heifner
Remove cout in unittest, replace with dlog
064f238
@heifner
GH-333 Remove unneeded calls to forkdb->head()
93511f3
@heifner
GH-333 Make public controller fork_db_head* return fork db pending head
eac6bc7
@heifner
GH-333 Send branch from chain_head, also rename fork_head in connecti…
096c3a1 
…on to avoid confusion with local variables named fork_head
@heifner
GH-333 Use local fork_db_head_irreversible_blocknum with chain_head i…
171cda4 
…nstead of forkdb.head()
@heifner
GH-333 Use pending head for branch of irreversible
04945ce
@heifner
GH-333 Use pending head during startup instead of head
ca11e84
@heifner
GH-333 Remove fork_db_head_or_pending
a6f1ba9
@heifner
GH-333 Optimize get_info by extracting block_num from id
c9de9a3
@heifner
GH-333 Update test to use head
44bcc6c
@heifner
GH-333 Remove valid from fork choice rule. Optionally return root fro…
13ef4f1 
…m pending_head() which will be clearer when renamed to head().
@heifner
GH-333 Store if_irreversible_block_id in fork database
a411680
@heifner
GH-333 Use fork database to track savanna irreversible block id
06b2c88
@heifner
GH-333 Add debug log output of maybe_switch_forks
aa4ba63
@heifner
GH-333 Verify correct type of block state
201a1d5
@heifner
GH-333 Transition valid blocks
3c1dfe1
@heifner
GH-333 Add startup tests in irreversible mode
0d5c8c2
@heifner
GH-333 Maintain legacy only advancing LIB via validated blocks. Trans…
c60e459 
…ition from legacy to savanna depends on this.
@heifner
GH-333 Remove mark_valid from fork_database since validated no longer…
53a3e53 
… part of fork choice rule
@heifner
Merge remote-tracking branch 'spring/replay_test' into GH-333-forkdb-…
6379dcf 
…head
@heifner
GH-333 Mark block state in forkdb as valid
7aa505d
@heifner
GH-333 Fix bad block legacy fork test to allow forking on second to l…
53ba6e2 
…ast block due to block id difference.
@heifner
GH-333 Renamed pending_head() to head()
5cc3030
@heifner
GH-333 Fix comment
cebccfc
@heifner heifner requested review from greg7mdp and linh2931 July 9, 2024 19:32
@heifner heifner added the OCI Work exclusive to OCI team label Jul 9, 2024
@heifner heifner linked an issue Jul 9, 2024 that may be closed by this pull request
Remove distinction between fork_db pending_head and head; persist if_irreversible_block_id in fork_db; add fork_db_pending_lib_num #333
Closed
greg7mdp
greg7mdp reviewed Jul 9, 2024
View reviewed changes
libraries/chain/controller.cpp Outdated Show resolved Hide resolved
libraries/chain/fork_database.cpp Outdated Show resolved Hide resolved
@heifner heifner mentioned this pull request Jul 9, 2024
Merged
Base automatically changed from replay_test to main July 10, 2024 13:28
linh2931
linh2931 reviewed Jul 10, 2024
View reviewed changes
libraries/chain/include/eosio/chain/fork_database.hpp Outdated Show resolved Hide resolved
libraries/chain/include/eosio/chain/fork_database.hpp Outdated Show resolved Hide resolved
plugins/net_plugin/net_plugin.cpp Outdated Show resolved Hide resolved
plugins/net_plugin/net_plugin.cpp Show resolved Hide resolved
linh2931
linh2931 reviewed Jul 10, 2024
View reviewed changes
libraries/chain/include/eosio/chain/fork_database.hpp

/**
* The calculated pending savanna LIB ID that will become LIB or is currently LIB
*/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those comments are very helpful!

@heifner heifner merged commit 717ec0c into main Jul 10, 2024
36 checks passed
@heifner heifner deleted the GH-333-forkdb-head branch July 10, 2024 16:48
@ericpassmore
Copy link
Contributor

Note:start
group: STABILITY
category: INTERNALS
summary: Refactor ForkDB to consolidate concept of HEAD and better track the pending irreversible block.
Note:end

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@greg7mdp greg7mdp greg7mdp approved these changes

@linh2931 linh2931 linh2931 approved these changes

Assignees
No one assigned
Labels
OCI Work exclusive to OCI team
Projects
None yet
Milestone
No milestone
4 participants
@heifner @ericpassmore @greg7mdp @linh2931