Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix race condition between bootstrap pull and push #3721

Merged
merged 1 commit into from
Feb 8, 2022
Merged

fix race condition between bootstrap pull and push #3721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions nano/core_test/bootstrap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,10 +459,7 @@ TEST (bootstrap_processor, DISABLED_push_diamond_pruning)
node1->stop ();
}

// Test disabled because it's failing intermittently.
// PR in which it got disabled: https://github.com/nanocurrency/nano-node/pull/3532
// Issue for investigating it: https://github.com/nanocurrency/nano-node/issues/3533
TEST (bootstrap_processor, DISABLED_push_one)
TEST (bootstrap_processor, push_one)
{
nano::system system;
nano::node_config config (nano::get_available_port (), system.logging);
Expand Down
2 changes: 1 addition & 1 deletion nano/node/bootstrap/bootstrap_frontier.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,14 +192,14 @@ void nano::frontier_req_client::received_frontier (boost::system::error_code con
// Set last processed account as new start target
attempt->set_start_account (last_account);
}
connection->connections.pool_connection (connection);
try
{
promise.set_value (false);
}
catch (std::future_error &)
{
}
connection->connections.pool_connection (connection);
}
}
else
Expand Down