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

Fix for test election.quorum_minimum_update_weight_before_quorum_checks (#3932)

Browse source 
* Fix for test election.quorum_minimum_update_weight_before_quorum_checks

The problem was that there was a race condition between the rep crawler
background thread and rep_crawler::response(). For the response to be
processed as valid, a request must be marked in rep_crawler::active
container. I added  force flag in rep_crawler::response to insert the vote
regardless to be used in testing.
This commit is contained in:
Dimitrios Siganos 2022-08-31 17:15:48 +01:00 • committed by GitHub
commit a42f96c4d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nano/core_test/election.cpp
View file

@ -188,6 +188,7 @@ TEST (election, quorum_minimum_confirm_fail)
namespace nano
{
// FIXME: this test fails on rare occasions. It needs a review.
TEST (election, quorum_minimum_update_weight_before_quorum_checks)
{
nano::test::system system{};
@ -243,7 +244,7 @@ TEST (election, quorum_minimum_update_weight_before_quorum_checks)
ASSERT_NE (channel, nullptr);
auto const vote2 = std::make_shared<nano::vote> (key1.pub, key1.prv, nano::vote::timestamp_max, nano::vote::duration_max, std::vector<nano::block_hash>{ send1->hash () });
ASSERT_TIMELY (10s, !node1.rep_crawler.response (channel, vote2));
ASSERT_FALSE (node1.rep_crawler.response (channel, vote2, true));
ASSERT_FALSE (election->confirmed ());
{

4
nano/node/repcrawler.cpp
View file

@ -230,13 +230,13 @@ bool nano::rep_crawler::is_pr (nano::transport::channel const & channel_a) const
return result;
}
bool nano::rep_crawler::response (std::shared_ptr<nano::transport::channel> const & channel_a, std::shared_ptr<nano::vote> const & vote_a)
bool nano::rep_crawler::response (std::shared_ptr<nano::transport::channel> const & channel_a, std::shared_ptr<nano::vote> const & vote_a, bool force)
{
bool error = true;
nano::lock_guard<nano::mutex> lock (active_mutex);
for (auto i = vote_a->hashes.begin (), n = vote_a->hashes.end (); i != n; ++i)
{
if (active.count (*i) != 0)
if (force || active.count (*i) != 0)
{
responses.emplace_back (channel_a, vote_a);
error = false;

5
nano/node/repcrawler.hpp
View file

@ -98,9 +98,10 @@ public:
/**
* Called when a non-replay vote on a block previously sent by query() is received. This indicates
* with high probability that the endpoint is a representative node.
* @return false if the vote corresponded to any active hash.
* The force flag can be set to skip the active check in unit testing when we want to force a vote in the rep crawler.
* @return false if any vote passed the checks and was added to the response queue of the rep crawler
*/
bool response (std::shared_ptr<nano::transport::channel> const &, std::shared_ptr<nano::vote> const &);
bool response (std::shared_ptr<nano::transport::channel> const &, std::shared_ptr<nano::vote> const &, bool force = false);
/** Get total available weight from representatives */
nano::uint128_t total_weight () const;