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

Push missing blocks back to the peer we requested frontiers from since this is the node missing the blocks. (#844)

Browse source
This commit is contained in:
clemahieu 2018-05-04 18:33:46 +01:00 • committed by GitHub
commit c11d5c8fcb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

40
rai/node/bootstrap.cpp
View file

@ -775,32 +775,27 @@ void rai::bootstrap_attempt::request_pull (std::unique_lock<std::mutex> & lock_a
}
}
bool rai::bootstrap_attempt::request_push (std::unique_lock<std::mutex> & lock_a)
void rai::bootstrap_attempt::request_push (std::unique_lock<std::mutex> & lock_a)
{
auto result (true);
auto connection_l (connection (lock_a));
if (connection_l)
bool error (false);
if (auto connection_shared = connection_frontier_request.lock ())
{
std::future<bool> future;
{
auto client (std::make_shared<rai::bulk_push_client> (connection_l));
client->start ();
push = client;
future = client->promise.get_future ();
}
auto client (std::make_shared<rai::bulk_push_client> (connection_shared));
client->start ();
push = client;
auto future (client->promise.get_future ());
lock_a.unlock ();
result = consume_future (future);
error = consume_future (future);
lock_a.lock ();
if (node->config.logging.network_logging ())
}
if (node->config.logging.network_logging ())
{
BOOST_LOG (node->log) << "Exiting bulk push client";
if (error)
{
BOOST_LOG (node->log) << "Exiting bulk push client";
if (result)
{
BOOST_LOG (node->log) << "Bulk push client failed";
}
BOOST_LOG (node->log) << "Bulk push client failed";
}
}
return result;
}
bool rai::bootstrap_attempt::still_pulling ()
@ -851,11 +846,7 @@ void rai::bootstrap_attempt::run ()
{
BOOST_LOG (node->log) << "Completed pulls";
}
auto push_failure (true);
while (!stopped && push_failure)
{
push_failure = request_push (lock);
}
request_push (lock);
stopped = true;
condition.notify_all ();
idle.clear ();
@ -1117,7 +1108,6 @@ void rai::bootstrap_attempt::requeue_pull (rai::pull_info const & pull_a)
std::lock_guard<std::mutex> lock (mutex);
if (auto connection_shared = connection_frontier_request.lock ())
{
auto size (pulls.size ());
node->background ([connection_shared, pull]() {
auto client (std::make_shared<rai::bulk_pull_client> (connection_shared, pull));
client->request ();

2
rai/node/bootstrap.hpp
View file

@ -65,7 +65,7 @@ public:
void populate_connections ();
bool request_frontier (std::unique_lock<std::mutex> &);
void request_pull (std::unique_lock<std::mutex> &);
bool request_push (std::unique_lock<std::mutex> &);
void request_push (std::unique_lock<std::mutex> &);
void add_connection (rai::endpoint const &);
void pool_connection (std::shared_ptr<rai::bootstrap_client>);
void stop ();