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

Removing cache since it's no longer saving transaction commits since process_receive_many is no longer parameterized by transaction.

Browse source
This commit is contained in:
clemahieu 2017-06-20 18:36:05 -05:00
commit 17306dbc05
2 changed files with 23 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

92
rai/node/bootstrap.cpp
View file

@ -502,15 +502,30 @@ void rai::bulk_pull_client::received_block (boost::system::error_code const & ec
{
expected = block->previous ();
}
auto already_exists (false);
connection.node->process_receive_many (*block, [this] (MDB_txn * transaction_a, rai::process_return result_a, rai::block const & block_a)
{
rai::transaction transaction (connection.node->store.environment, nullptr, false);
already_exists = connection.node->store.block_exists (transaction, hash);
}
if (!already_exists)
{
connection.attempt->cache.add_block (std::move (block));
}
switch (result_a.code)
{
case rai::process_result::progress:
case rai::process_result::old:
break;
case rai::process_result::fork:
{
auto node_l (connection.node);
auto block (node_l->ledger.forked_block (transaction_a, block_a));
node_l->active.start (transaction_a, *block, [node_l] (rai::block & block_a)
{
node_l->process_confirmed (block_a);
});
connection.node->network.broadcast_confirm_req (block_a);
connection.node->network.broadcast_confirm_req (*block);
BOOST_LOG (connection.node->log) << boost::str (boost::format ("Fork received in bootstrap between: %1% and %2% root %3%") % block_a.hash ().to_string () % block->hash ().to_string () % block_a.root ().to_string ());
break;
}
default:
break;
}
});
receive_block ();
}
else
@ -649,63 +664,6 @@ void rai::bulk_push_client::push_block (rai::block const & block_a)
});
}
rai::bootstrap_pull_cache::bootstrap_pull_cache (rai::bootstrap_attempt & attempt_a) :
attempt (attempt_a)
{
}
void rai::bootstrap_pull_cache::add_block (std::unique_ptr <rai::block> block_a)
{
std::lock_guard <std::mutex> lock (mutex);
blocks.emplace_back (std::move (block_a));
}
void rai::bootstrap_pull_cache::flush (size_t minimum_a)
{
decltype (blocks) blocks_l;
{
std::lock_guard <std::mutex> lock (mutex);
if (blocks.size () > minimum_a)
{
blocks.swap (blocks_l);
}
}
while (!blocks_l.empty ())
{
auto count (0);
while (!blocks_l.empty () && count < rai::blocks_per_transaction)
{
auto & front (blocks_l.front ());
attempt.node->process_receive_many (*front, [this] (MDB_txn * transaction_a, rai::process_return result_a, rai::block const & block_a)
{
switch (result_a.code)
{
case rai::process_result::progress:
case rai::process_result::old:
break;
case rai::process_result::fork:
{
auto node_l (attempt.node);
auto block (node_l->ledger.forked_block (transaction_a, block_a));
node_l->active.start (transaction_a, *block, [node_l] (rai::block & block_a)
{
node_l->process_confirmed (block_a);
});
attempt.node->network.broadcast_confirm_req (block_a);
attempt.node->network.broadcast_confirm_req (*block);
BOOST_LOG (attempt.node->log) << boost::str (boost::format ("Fork received in bootstrap between: %1% and %2% root %3%") % block_a.hash ().to_string () % block->hash ().to_string () % block_a.root ().to_string ());
break;
}
default:
break;
}
});
blocks_l.pop_front ();
++count;
}
}
}
rai::pull_info::pull_info () :
account (0),
end (0),
@ -723,14 +681,12 @@ attempts (0)
rai::bootstrap_attempt::bootstrap_attempt (std::shared_ptr <rai::node> node_a) :
node (node_a),
cache (*this),
state (rai::attempt_state::starting)
{
}
rai::bootstrap_attempt::~bootstrap_attempt ()
{
cache.flush (0);
node->bootstrap_initiator.notify_listeners ();
BOOST_LOG (node->log) << "Exiting bootstrap attempt";
}
@ -865,7 +821,6 @@ void rai::bootstrap_attempt::completed_pull (std::shared_ptr <rai::bootstrap_cli
}
client_a->pull_client.pull = rai::pull_info ();
}
cache.flush (cache.block_count);
if (repool)
{
pool_connection (client_a);
@ -876,7 +831,6 @@ void rai::bootstrap_attempt::completed_pulls (std::shared_ptr <rai::bootstrap_cl
{
BOOST_LOG (node->log) << "Completed pulls";
assert (node->bootstrap_initiator.in_progress ());
cache.flush (0);
auto pushes (std::make_shared <rai::bulk_push_client> (client_a));
pushes->start ();
}

13
rai/node/bootstrap.hpp
View file

@ -47,18 +47,6 @@ public:
std::function <rai::sync_result (MDB_txn *, rai::block const &)> target_m;
rai::node & node;
};
class bootstrap_pull_cache
{
public:
bootstrap_pull_cache (rai::bootstrap_attempt &);
void add_block (std::unique_ptr <rai::block>);
void flush (size_t);
size_t const block_count = 256;
bootstrap_attempt & attempt;
private:
std::mutex mutex;
std::deque <std::unique_ptr <rai::block>> blocks;
};
class bootstrap_client;
enum class attempt_state
{
@ -99,7 +87,6 @@ public:
std::unordered_map <rai::bootstrap_client *, std::weak_ptr <rai::bootstrap_client>> active;
std::vector <std::shared_ptr <rai::bootstrap_client>> idle;
std::shared_ptr <rai::node> node;
rai::bootstrap_pull_cache cache;
rai::attempt_state state;
std::unordered_set <rai::endpoint> attempted;
private: