Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

use p2p address for duplicate connection resolution #10006

Merged
merged 2 commits into from
Feb 10, 2021
Merged

use p2p address for duplicate connection resolution #10006

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
614b928
use p2p address for duplicate connection resolution
huangminghuang Feb 4, 2021
d3faf27
Merge branch 'develop' into huangminghuang/duplicate-connection-fix.
huangminghuang Feb 10, 2021
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
35 changes: 22 additions & 13 deletions plugins/net_plugin/net_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,8 +422,9 @@ namespace eosio {
constexpr uint16_t proto_block_id_notify = 2; // reserved. feature was removed. next net_version should be 3
constexpr uint16_t proto_pruned_types = 3; // supports new signed_block & packed_transaction types
constexpr uint16_t heartbeat_interval = 4; // supports configurable heartbeat interval
constexpr uint16_t dup_goaway_resolution = 5; // support peer address based duplicate connection resolution

constexpr uint16_t net_version = heartbeat_interval;
constexpr uint16_t net_version = dup_goaway_resolution;

/**
* Index by start_block_num
Expand Down Expand Up @@ -2841,18 +2842,26 @@ namespace eosio {
if(check.get() == this)
continue;
if(check->connected() && check->peer_name() == msg.p2p_address) {
// It's possible that both peers could arrive here at relatively the same time, so
// we need to avoid the case where they would both tell a different connection to go away.
// Using the sum of the initial handshake times of the two connections, we will
// arbitrarily (but consistently between the two peers) keep one of them.
std::unique_lock<std::mutex> g_check_conn( check->conn_mtx );
auto check_time = check->last_handshake_sent.time + check->last_handshake_recv.time;
g_check_conn.unlock();
g_conn.lock();
auto c_time = last_handshake_sent.time;
g_conn.unlock();
if (msg.time + c_time <= check_time)
continue;
if (net_version < dup_goaway_resolution || msg.network_version < dup_goaway_resolution) {
// It's possible that both peers could arrive here at relatively the same time, so
// we need to avoid the case where they would both tell a different connection to go away.
// Using the sum of the initial handshake times of the two connections, we will
// arbitrarily (but consistently between the two peers) keep one of them.

std::unique_lock<std::mutex> g_check_conn( check->conn_mtx );
auto check_time = check->last_handshake_sent.time + check->last_handshake_recv.time;
g_check_conn.unlock();
g_conn.lock();
auto c_time = last_handshake_sent.time;
g_conn.unlock();
if (msg.time + c_time <= check_time)
continue;
}
else if (my_impl->p2p_address < msg.p2p_address) {
// only the connection from lower p2p_address to higher p2p_address will be considered as a duplicate,
// so there is no chance for both connections to be closed
continue;
}
Copy link
Contributor

Choose a reason for hiding this comment

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

I'd like a comment like "only the p2p node with the higher of the 2 addresses will decide which connection is a duplicate, so there is no chance for both connections to be closed"


g_cnts.unlock();
fc_dlog( logger, "sending go_away duplicate to ${ep}", ("ep",msg.p2p_address) );
Expand Down