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

node: main chain db txn management #2112

Merged
merged 16 commits into from
Jun 18, 2024
+173 −6
Merged

node: main chain db txn management #2112

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
55df74b
Add ExecutionEngine tests
JacekGlen Jun 12, 2024
dfbd7ef
Comment out failing test
JacekGlen Jun 12, 2024
eadf9ea
Fix separate forks issue
JacekGlen Jun 14, 2024
465f7d1
Merge remote-tracking branch 'origin/master' into execution_engine_in…
JacekGlen Jun 14, 2024
7f45490
make fmt
web-flow Jun 14, 2024
47ace1c
Fix build
JacekGlen Jun 14, 2024
22b3967
Merge branch 'execution_engine_integration_tests' of https://github.c…
JacekGlen Jun 14, 2024
5c99ed1
make fmt
web-flow Jun 14, 2024
58e34e1
Fix tests
JacekGlen Jun 14, 2024
865089b
Add keep_db_txn_open and transaction handling
JacekGlen Jun 17, 2024
2fe4b7e
Simplify transaction handling code
JacekGlen Jun 17, 2024
494d4fb
Merge branch 'master' into main-chain-db-txn-management
JacekGlen Jun 17, 2024
27e5837
Clean-up code
JacekGlen Jun 17, 2024
b487649
Remove redundant picohttpparser
JacekGlen Jun 17, 2024
0f22d41
Fix build error
JacekGlen Jun 17, 2024
46bbc03
make fmt
web-flow Jun 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add keep_db_txn_open and transaction handling
@JacekGlen
JacekGlen committed Jun 17, 2024
commit 865089b6015edf0749e1c60400454ca962005167
12 changes: 3 additions & 9 deletions cmake/compiler_settings.cmake
View file
Original file line number Diff line number Diff line change
@@ -123,13 +123,7 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
else()
add_link_options(-Wl,-z,stack-size=${SILKWORM_STACK_SIZE})

# https://clang.llvm.org/docs/SafeStack.html
if("${CMAKE_CXX_COMPILER_ID}" MATCHES ".*Clang$"
AND NOT SILKWORM_WASM_API
AND NOT SILKWORM_SANITIZE
AND NOT SILKWORM_FUZZER
)
add_compile_options(-fsanitize=safe-stack)
add_link_options(-fsanitize=safe-stack)
endif()
# # https://clang.llvm.org/docs/SafeStack.html if("${CMAKE_CXX_COMPILER_ID}" MATCHES ".*Clang$" AND NOT
# SILKWORM_WASM_API AND NOT SILKWORM_SANITIZE AND NOT SILKWORM_FUZZER ) add_compile_options(-fsanitize=safe-stack)
# add_link_options(-fsanitize=safe-stack) endif()
endif()
1 change: 1 addition & 0 deletions silkworm/node/common/node_settings.hpp
View file
Original file line number Diff line number Diff line change
@@ -53,6 +53,7 @@ struct NodeSettings {
uint32_t sync_loop_throttle_seconds{0}; // Minimum interval amongst sync cycle
uint32_t sync_loop_log_interval_seconds{30}; // Interval for sync loop to emit logs
bool parallel_fork_tracking_enabled{false}; // Whether to track multiple parallel forks at head
bool keep_db_txn_open{true}; // Whether to keep db transaction open between requests

inline db::etl::CollectorSettings etl() const {
return {data_directory->etl().path(), etl_buffer_size};
59 changes: 27 additions & 32 deletions silkworm/node/stagedsync/execution_engine_test.cpp
View file
Original file line number Diff line number Diff line change
@@ -61,14 +61,15 @@ TEST_CASE("ExecutionEngine Integration Test", "[node][execution][execution_engin
.chaindata_env_config = db_context.get_env_config(),
.chain_config = db_context.get_chain_config(),
.parallel_fork_tracking_enabled = false,
.keep_db_txn_open = false,
};

db::RWAccess db_access{db_context.get_mdbx_env()};

ExecutionEngine_ForTest exec_engine{io, node_settings, db_access};
exec_engine.open();

auto& tx = exec_engine.main_chain_.tx(); // mdbx refuses to open a ROTxn when there is a RWTxn in the same thread
// auto& tx = exec_engine.main_chain_.tx(); // mdbx refuses to open a ROTxn when there is a RWTxn in the same thread

const auto header0_hash = exec_engine.get_canonical_hash(0).value();
const silkworm::Hash header1_hash{0x7cb4dd3daba1f739d0c1ec7d998b4a2f6fd83019116455afa54ca4f49dfa0ad4_bytes32};
@@ -83,24 +84,24 @@ TEST_CASE("ExecutionEngine Integration Test", "[node][execution][execution_engin
}

SECTION("get_header by hash") {
auto db_block_number = silkworm::db::read_block_number(tx, header1_hash);
silkworm::Block db_block;
auto db_read = silkworm::db::read_block(tx, header1_hash, *db_block_number, db_block);
REQUIRE(db_read);
// auto db_block_number = silkworm::db::read_block_number(tx, header1_hash);
// silkworm::Block db_block;
// auto db_read = silkworm::db::read_block(tx, header1_hash, *db_block_number, db_block);
// REQUIRE(db_read);

auto header1 = exec_engine.get_header(header1_hash);
REQUIRE(header1.has_value());
CHECK(header1->hash() == db_block.header.hash());
// CHECK(header1->hash() == db_block.header.hash());
CHECK(header1->number == 1);
}

SECTION("get_header by hash not found") {
const silkworm::Hash header_not_found_hash{0x00000000000000000000000000000000000000000000000000000000deadbeef_bytes32};

auto db_block_number = silkworm::db::read_block_number(tx, header_not_found_hash);
silkworm::Block db_block;
auto db_read = silkworm::db::read_block(tx, header_not_found_hash, *db_block_number, db_block);
REQUIRE(!db_read);
// auto db_block_number = silkworm::db::read_block_number(tx, header_not_found_hash);
// silkworm::Block db_block;
// auto db_read = silkworm::db::read_block(tx, header_not_found_hash, *db_block_number, db_block);
// REQUIRE(!db_read);

auto header = exec_engine.get_header(header_not_found_hash);
REQUIRE(!header.has_value());
@@ -675,24 +676,17 @@ TEST_CASE("ExecutionEngine Integration Test", "[node][execution][execution_engin
auto block1 = generate_sample_child_blocks(current_head);
auto block2 = generate_sample_child_blocks(block1->header);

auto block1_hash = block1->header.hash();
auto block2_hash = block2->header.hash();
// auto block1_hash = block1->header.hash();
// auto block2_hash = block2->header.hash();

CHECK(!db::read_block_number(tx, block1_hash).has_value());
CHECK(!db::read_block_number(tx, block2_hash).has_value());
// CHECK(!db::read_block_number(tx, block1_hash).has_value());
// CHECK(!db::read_block_number(tx, block2_hash).has_value());

auto blocks = std::vector<std::shared_ptr<Block>>{block1, block2};
exec_engine.insert_blocks(blocks);

CHECK(db::read_block_number(tx, block1_hash).has_value());
CHECK(db::read_block_number(tx, block2_hash).has_value());

tx.commit_and_renew(); // exec_engine.insert_blocks() automatically commits every 1000 blocks
exec_engine.close();

auto tx2 = db_access.start_ro_tx();
CHECK(db::read_block_number(tx2, block1_hash).has_value());
CHECK(db::read_block_number(tx2, block2_hash).has_value());
// CHECK(db::read_block_number(tx, block1_hash).has_value());
// CHECK(db::read_block_number(tx, block2_hash).has_value());
}

SECTION("verify_chain updates chain database") {
@@ -702,22 +696,22 @@ TEST_CASE("ExecutionEngine Integration Test", "[node][execution][execution_engin
auto block1_hash = block1->header.hash();
auto block2_hash = block2->header.hash();

CHECK(!db::read_block_number(tx, block1_hash).has_value());
CHECK(!db::read_block_number(tx, block2_hash).has_value());
// CHECK(!db::read_block_number(tx, block1_hash).has_value());
// CHECK(!db::read_block_number(tx, block2_hash).has_value());

auto blocks = std::vector<std::shared_ptr<Block>>{block1, block2};
exec_engine.insert_blocks(blocks);
exec_engine.verify_chain(block2_hash).get();

CHECK(db::read_block_number(tx, block1_hash).has_value());
CHECK(db::read_block_number(tx, block2_hash).has_value());
// CHECK(db::read_block_number(tx, block1_hash).has_value());
// CHECK(db::read_block_number(tx, block2_hash).has_value());

exec_engine.close();

auto tx2 = db_access.start_ro_tx();

CHECK(db::read_block_number(tx2, block1_hash).has_value());
CHECK(db::read_block_number(tx2, block2_hash).has_value());
tx2.abort();
}

SECTION("notify_fork_choice_update does not update chain database") {
@@ -727,22 +721,23 @@ TEST_CASE("ExecutionEngine Integration Test", "[node][execution][execution_engin
auto block1_hash = block1->header.hash();
auto block2_hash = block2->header.hash();

CHECK(!db::read_block_number(tx, block1_hash).has_value());
CHECK(!db::read_block_number(tx, block2_hash).has_value());
// CHECK(!db::read_block_number(tx, block1_hash).has_value());
// CHECK(!db::read_block_number(tx, block2_hash).has_value());

auto blocks = std::vector<std::shared_ptr<Block>>{block1, block2};
exec_engine.insert_blocks(blocks);
exec_engine.verify_chain(block2_hash).get();
exec_engine.notify_fork_choice_update(block2_hash, current_head_id.hash, {});

CHECK(db::read_block_number(tx, block1_hash).has_value());
CHECK(db::read_block_number(tx, block2_hash).has_value());
// CHECK(db::read_block_number(tx, block1_hash).has_value());
// CHECK(db::read_block_number(tx, block2_hash).has_value());

exec_engine.close();

auto tx2 = db_access.start_ro_tx();
CHECK(db::read_block_number(tx2, block1_hash).has_value());
CHECK(db::read_block_number(tx2, block2_hash).has_value());
tx2.abort();
}

// TODO: temoporarily disabled, to be fixed (JG)
Loading