dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix disconnected nodes

Browse source
This commit is contained in:
Piotr Wójcik 2024-03-29 11:08:43 +01:00
commit 8eb54ba01a
2 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

38
nano/test_common/system.cpp
View file

@ -75,19 +75,15 @@ void nano::test::system::stop ()
{ {
logger.debug (nano::log::type::system, "Stopping..."); logger.debug (nano::log::type::system, "Stopping...");
// Keep io_context running while stopping // Keep io_context running while stopping nodes
auto stopped = std::async (std::launch::async, [&] { for (auto & node : nodes)
for (auto & node : nodes) {
{ stop_node (*node);
node->stop (); }
} for (auto & node : disconnected_nodes)
}); {
stop_node (*node);
auto ec = poll_until_true (10s, [&] { }
auto status = stopped.wait_for (0s);
return status == std::future_status::ready;
});
debug_assert (!ec);
io_guard.reset (); io_guard.reset ();
work.stop (); work.stop ();
@ -120,8 +116,9 @@ std::shared_ptr<nano::node> nano::test::system::add_node (nano::node_config cons
wallet->insert_adhoc (rep->prv); wallet->insert_adhoc (rep->prv);
} }
node->start (); node->start ();
nodes.reserve (nodes.size () + 1);
nodes.push_back (node); nodes.push_back (node);
// Connect with other nodes
if (nodes.size () > 1) if (nodes.size () > 1)
{ {
debug_assert (nodes.size () - 1 <= node->network_params.network.max_peers_per_ip || node->flags.disable_max_peers_per_ip); // Check that we don't start more nodes than limit for single IP address debug_assert (nodes.size () - 1 <= node->network_params.network.max_peers_per_ip || node->flags.disable_max_peers_per_ip); // Check that we don't start more nodes than limit for single IP address
@ -197,17 +194,22 @@ std::shared_ptr<nano::node> nano::test::system::add_node (nano::node_config cons
return node; return node;
} }
// TODO: Merge with add_node
std::shared_ptr<nano::node> nano::test::system::make_disconnected_node (std::optional<nano::node_config> opt_node_config, nano::node_flags flags) std::shared_ptr<nano::node> nano::test::system::make_disconnected_node (std::optional<nano::node_config> opt_node_config, nano::node_flags flags)
{ {
nano::node_config node_config = opt_node_config.has_value () ? *opt_node_config : default_config (); nano::node_config node_config = opt_node_config.has_value () ? *opt_node_config : default_config ();
auto node = std::make_shared<nano::node> (io_ctx, nano::unique_path (), node_config, work, flags); auto node = std::make_shared<nano::node> (io_ctx, nano::unique_path (), node_config, work, flags);
if (node->init_error ()) for (auto i : initialization_blocks)
{ {
std::cerr << "node init error\n"; auto result = node->ledger.process (node->store.tx_begin_write (), i);
return nullptr; debug_assert (result == nano::block_status::progress);
} }
debug_assert (!node->init_error ());
node->start (); node->start ();
nodes.push_back (node); disconnected_nodes.push_back (node);
logger.debug (nano::log::type::system, "Node started (disconnected): {}", node->get_node_id ().to_node_id ());
return node; return node;
} }

1
nano/test_common/system.hpp
View file

@ -80,6 +80,7 @@ namespace test
std::shared_ptr<boost::asio::io_context> io_ctx; std::shared_ptr<boost::asio::io_context> io_ctx;
boost::asio::executor_work_guard<boost::asio::io_context::executor_type> io_guard; boost::asio::executor_work_guard<boost::asio::io_context::executor_type> io_guard;
std::vector<std::shared_ptr<nano::node>> nodes; std::vector<std::shared_ptr<nano::node>> nodes;
std::vector<std::shared_ptr<nano::node>> disconnected_nodes;
nano::stats stats; nano::stats stats;
nano::logger logger{ "tests" }; nano::logger logger{ "tests" };
nano::work_pool work{ nano::dev::network_params.network, std::max (nano::hardware_concurrency (), 1u) }; nano::work_pool work{ nano::dev::network_params.network, std::max (nano::hardware_concurrency (), 1u) };