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

Prevent concurrent bootstrap populate_connections () (#2386)

Browse source 
From run (), lazy_run () etc. if there are several runs in single bootstrap attempt
This commit is contained in:
Sergey Kroshnin 2019-11-06 11:00:51 +03:00 • committed by Guilherme Lawless
commit 2dff3d8abd
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
nano/node/bootstrap/bootstrap.cpp
View file

@ -232,7 +232,7 @@ void nano::bootstrap_attempt::run_start (nano::unique_lock<std::mutex> & lock_a)
void nano::bootstrap_attempt::run ()
{
assert (!node->flags.disable_legacy_bootstrap);
populate_connections ();
start_populate_connections ();
nano::unique_lock<std::mutex> lock (mutex);
run_start (lock);
while (still_pulling ())
@ -455,6 +455,14 @@ void nano::bootstrap_attempt::populate_connections ()
}
}
void nano::bootstrap_attempt::start_populate_connections ()
{
if (!populate_connections_started.exchange (true))
{
populate_connections ();
}
}
void nano::bootstrap_attempt::add_connection (nano::endpoint const & endpoint_a)
{
connect_client (nano::tcp_endpoint (endpoint_a.address (), endpoint_a.port ()));
@ -889,7 +897,7 @@ void nano::bootstrap_attempt::lazy_clear ()
void nano::bootstrap_attempt::lazy_run ()
{
assert (!node->flags.disable_lazy_bootstrap);
populate_connections ();
start_populate_connections ();
auto start_time (std::chrono::steady_clock::now ());
auto max_time (std::chrono::minutes (node->flags.disable_legacy_bootstrap ? 7 * 24 * 60 : 30));
nano::unique_lock<std::mutex> lock (mutex);
@ -1242,7 +1250,7 @@ bool nano::bootstrap_attempt::wallet_finished ()
void nano::bootstrap_attempt::wallet_run ()
{
assert (!node->flags.disable_wallet_bootstrap);
populate_connections ();
start_populate_connections ();
auto start_time (std::chrono::steady_clock::now ());
auto max_time (std::chrono::minutes (10));
nano::unique_lock<std::mutex> lock (mutex);

2
nano/node/bootstrap/bootstrap.hpp
View file

@ -65,6 +65,7 @@ public:
std::shared_ptr<nano::bootstrap_client> connection (nano::unique_lock<std::mutex> &);
bool consume_future (std::future<bool> &);
void populate_connections ();
void start_populate_connections ();
bool request_frontier (nano::unique_lock<std::mutex> &);
void request_pull (nano::unique_lock<std::mutex> &);
void request_push (nano::unique_lock<std::mutex> &);
@ -125,6 +126,7 @@ public:
std::vector<std::pair<nano::block_hash, nano::block_hash>> bulk_push_targets;
std::atomic<bool> frontiers_received{ false };
std::atomic<bool> frontiers_confirmed{ false };
std::atomic<bool> populate_connections_started{ false };
std::atomic<bool> stopped{ false };
std::chrono::steady_clock::time_point attempt_start{ std::chrono::steady_clock::now () };
nano::bootstrap_mode mode;