Skip to content

[1.2.2] P2P: Reset sync on rejected block #1726

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

Merged
heifner merged 3 commits into from
Jul 15, 2025
Merged

[1.2.2] P2P: Reset sync on rejected block #1726

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c29f07a
GH-1716 Use incoming() for clearer code
heifner Jul 14, 2025
2ae584d
GH-1716 Restore reset of sync on rejected block
heifner Jul 14, 2025
84d6beb
GH-1716 Also check for already 0
heifner Jul 14, 2025
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
13 changes: 10 additions & 3 deletions plugins/net_plugin/net_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,6 @@ namespace eosio {

void bcast_vote_message( uint32_t exclude_peer, const chain::vote_message_ptr& msg );

void start_conn_timer(boost::asio::steady_timer::duration du, std::weak_ptr<connection> from_connection);
void start_expire_timer();
void start_monitors();

Expand Down Expand Up @@ -1571,7 +1570,7 @@ namespace eosio {
if( latest_msg_time > std::chrono::steady_clock::time_point::min() ) {
if( current_time > latest_msg_time + hb_timeout ) {
no_retry = go_away_reason::benign_other;
if( !peer_address().empty() ) {
if( !incoming() ) {
peer_wlog(this, "heartbeat timed out for peer address");
close(true);
} else {
Expand Down Expand Up @@ -2398,6 +2397,14 @@ namespace eosio {
// called from connection strand
void sync_manager::rejected_block( const connection_ptr& c, uint32_t blk_num, closing_mode mode ) {
c->block_status_monitor_.rejected();
{
// reset sync on rejected block
fc::lock_guard g( sync_mtx );
if (sync_last_requested_num != 0 && blk_num <= sync_next_expected_num-1) { // no need to reset if we already reset and are syncing again
Copy link
Contributor

@greg7mdp greg7mdp Jul 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is not clear to me why this check indicates that we already reset?

Copy link
Contributor Author

@heifner heifner Jul 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Say you are syncing and blocks 50-100.

  • Block 65 is rejected.
    • Reset sync_last_requested_num = 0
    • sync_next_expected_num = 60 // something less <= 65 since set to LIB+1
  • Block 66 is rejected because 65 just was and 66 can't link to anything
    • 66 <= 59 is not true, so don't reset
    • Same for 67-100.

sync_last_requested_num = 0;
sync_next_expected_num = my_impl->get_fork_db_root_num() + 1;
}
}
if( mode == closing_mode::immediately || c->block_status_monitor_.max_events_violated()) {
peer_wlog(c, "block ${bn} not accepted, closing connection ${d}",
("d", mode == closing_mode::immediately ? "immediately" : "max violations reached")("bn", blk_num));
Expand Down Expand Up @@ -2781,7 +2788,7 @@ namespace eosio {
string paddr_desc = paddr_str + ":" + std::to_string(paddr_port);
connections.for_each_connection([&visitors, &from_addr, &paddr_str](const connection_ptr& conn) {
if (conn->socket_is_open()) {
if (conn->peer_address().empty()) {
if (conn->incoming()) {
++visitors;
fc::lock_guard g_conn(conn->conn_mtx);
if (paddr_str == conn->remote_endpoint_ip) {
Expand Down