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

Avoiding tx -> gap_cache::mutex with gap_cache::mutex -> tx deadlock when resizing environment.

Browse source
This commit is contained in:
clemahieu 2017-07-03 17:08:31 -05:00
commit a641250965
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rai/node/node.cpp
View file

@ -1268,13 +1268,13 @@ void rai::gap_cache::add (MDB_txn * transaction_a, rai::block const & block_a)
void rai::gap_cache::vote (rai::vote const & vote_a)
{
rai::transaction transaction (node.store.environment, nullptr, false);
std::lock_guard <std::mutex> lock (mutex);
auto hash (vote_a.block->hash ());
auto existing (blocks.get <1> ().find (hash));
if (existing != blocks.get <1> ().end ())
{
existing->votes->vote (vote_a);
rai::transaction transaction (node.store.environment, nullptr, false);
auto winner (node.ledger.winner (transaction, *existing->votes));
if (winner.first > bootstrap_threshold (transaction))
{
@ -1410,6 +1410,8 @@ void rai::node::process_receive_many (rai::block const & block_a, std::function
}
++count;
}
// Let other threads get an opportunity to transaction lock
std::this_thread::yield ();
}
}