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

nano::system::add_node reliability improvements (#3877)

Browse source 
* Use `poll_until_true` with timeout to ensure nodes are connected

Small improvement to system::add_node, use `poll_until_true` instead of explicit loops

This gives us ability to set timeout without resorting to counting iterations

* Wait for keepalive message exchange when setting up test system
This commit is contained in:
Piotr Wójcik 2022-07-26 17:06:43 +02:00 • committed by GitHub
commit 652b9218b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

71
nano/test_common/system.cpp
View file

@ -50,12 +50,16 @@ std::shared_ptr<nano::node> nano::system::add_node (nano::node_config const & no
{ {
auto node1 (*i); auto node1 (*i);
auto node2 (*j); auto node2 (*j);
auto starting1 (node1->network.size ());
size_t starting_listener1 (node1->bootstrap.realtime_count); auto starting_size_1 = node1->network.size ();
decltype (starting1) new1; auto starting_size_2 = node2->network.size ();
auto starting2 (node2->network.size ());
size_t starting_listener2 (node2->bootstrap.realtime_count); auto starting_realtime_1 = node1->bootstrap.realtime_count.load ();
decltype (starting2) new2; auto starting_realtime_2 = node2->bootstrap.realtime_count.load ();
auto starting_keepalives_1 = node1->stats.count (stat::type::message, stat::detail::keepalive, stat::dir::in);
auto starting_keepalives_2 = node2->stats.count (stat::type::message, stat::detail::keepalive, stat::dir::in);
if (type_a == nano::transport::transport_type::tcp) if (type_a == nano::transport::transport_type::tcp)
{ {
(*j)->network.merge_peer ((*i)->network.endpoint ()); (*j)->network.merge_peer ((*i)->network.endpoint ());
@ -66,42 +70,41 @@ std::shared_ptr<nano::node> nano::system::add_node (nano::node_config const & no
auto channel (std::make_shared<nano::transport::channel_udp> ((*j)->network.udp_channels, (*i)->network.endpoint (), node1->network_params.network.protocol_version)); auto channel (std::make_shared<nano::transport::channel_udp> ((*j)->network.udp_channels, (*i)->network.endpoint (), node1->network_params.network.protocol_version));
(*j)->network.send_keepalive (channel); (*j)->network.send_keepalive (channel);
} }
do
{ poll_until_true (3s, [&node1, &node2, starting_size_1, starting_size_2] () {
poll (); auto size_1 = node1->network.size ();
new1 = node1->network.size (); auto size_2 = node2->network.size ();
new2 = node2->network.size (); return size_1 > starting_size_1 && size_2 > starting_size_2;
} while (new1 == starting1 || new2 == starting2); });
if (type_a == nano::transport::transport_type::tcp && node_config_a.tcp_incoming_connections_max != 0 && !node_flags_a.disable_tcp_realtime) if (type_a == nano::transport::transport_type::tcp && node_config_a.tcp_incoming_connections_max != 0 && !node_flags_a.disable_tcp_realtime)
{ {
// Wait for initial connection finish // Wait for initial connection finish
decltype (starting_listener1) new_listener1; poll_until_true (3s, [&node1, &node2, starting_realtime_1, starting_realtime_2] () {
decltype (starting_listener2) new_listener2; auto realtime_1 = node1->bootstrap.realtime_count.load ();
do auto realtime_2 = node2->bootstrap.realtime_count.load ();
{ return realtime_1 > starting_realtime_1 && realtime_2 > starting_realtime_2;
poll (); });
new_listener1 = node1->bootstrap.realtime_count;
new_listener2 = node2->bootstrap.realtime_count; // Wait for keepalive message exchange
} while (new_listener1 == starting_listener1 || new_listener2 == starting_listener2); poll_until_true (3s, [&node1, &node2, starting_keepalives_1, starting_keepalives_2] () {
auto keepalives_1 = node1->stats.count (stat::type::message, stat::detail::keepalive, stat::dir::in);
auto keepalives_2 = node2->stats.count (stat::type::message, stat::detail::keepalive, stat::dir::in);
return keepalives_1 > starting_keepalives_1 && keepalives_2 > starting_keepalives_2;
});
} }
} }
auto iterations1 (0);
while (std::any_of (begin, nodes.end (), [] (std::shared_ptr<nano::node> const & node_a) { return node_a->bootstrap_initiator.in_progress (); })) // Ensure no bootstrap initiators are in progress
{ poll_until_true (3s, [this, &begin] () {
poll (); return std::all_of (begin, nodes.end (), [] (std::shared_ptr<nano::node> const & node_a) { return !node_a->bootstrap_initiator.in_progress (); });
++iterations1; });
debug_assert (iterations1 < 10000);
}
} }
else else
{ {
auto iterations1 (0); poll_until_true (3s, [&node] () {
while (node->bootstrap_initiator.in_progress ()) return !node->bootstrap_initiator.in_progress ();
{ });
poll ();
++iterations1;
debug_assert (iterations1 < 10000);
}
} }
return node; return node;