Skip to content

P2P: Do not attempt to establish a connection if a duplicate is already connected #1883

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

Open
heifner wants to merge 1 commit into
base: main
Choose a base branch
from
Open

P2P: Do not attempt to establish a connection if a duplicate is already connected #1883

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
1 change: 1 addition & 0 deletions plugins/net_plugin/include/eosio/net_plugin/net_plugin.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ namespace eosio {
string peer;
string remote_ip;
string remote_port;
uint32_t connection_id = 0;
bool connecting = false;
bool syncing = false;
bool is_bp_peer = false;
Expand Down
35 changes: 30 additions & 5 deletions plugins/net_plugin/net_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,8 @@ namespace eosio {

void add(connection_ptr c);
string connect(const string& host, const string& p2p_address);
string resolve_and_connect(const string& host, const string& p2p_address);
string resolve_and_connect(const string& peer_address, const string& listen_address);
connection_ptr is_other_connected(const string& peer_address, const connection_ptr& c) const;
string disconnect(const string& host);
void disconnect_gossip_connection(const string& host);
void close_all();
Expand Down Expand Up @@ -1351,6 +1352,7 @@ namespace eosio {

connection_status connection::get_status()const {
connection_status stat;
stat.connection_id = connection_id;
stat.connecting = state() == connection_state::connecting;
stat.syncing = peer_syncing_from_us;
stat.is_bp_peer = bp_connection != bp_connection_type::non_bp;
Expand Down Expand Up @@ -4951,7 +4953,7 @@ namespace eosio {
std::unique_lock g( connections_mtx );
supplied_peers.insert(host);
g.unlock();
fc_dlog(p2p_conn_log, "API connect ${h}", ("h", host));
fc_dlog(p2p_conn_log, "API connect '${h}'", ("h", host));
return resolve_and_connect( host, p2p_address );
}

Expand Down Expand Up @@ -4998,10 +5000,21 @@ namespace eosio {

connection_ptr c = shared_from_this();

if (no_retry == go_away_reason::duplicate) {
if (auto other = my_impl->connections.is_other_connected(peer_address(), c); !!other) {
fc_dlog( p2p_conn_log, "Skipping connect to ${p} - ${pid} due to existing connection ${o} - ${oid}",
("p", peer_address())("pid", connection_id)("o", other->peer_address())("oid", other->connection_id));
return true; // don't remvoe from valid connections
}
}

if( consecutive_immediate_connection_close > def_max_consecutive_immediate_connection_close || no_retry == go_away_reason::benign_other ) {
fc::microseconds connector_period = my_impl->connections.get_connector_period();
fc::lock_guard g( conn_mtx );
fc::unique_lock g( conn_mtx );
if( last_close == fc::time_point() || last_close > fc::time_point::now() - connector_period ) {
fc::time_point lclose = last_close;
g.unlock();
fc_dlog( p2p_conn_log, "Skipping connect due to last_close ${t}", ("t", lclose));
return true; // true so doesn't remove from valid connections
}
}
Expand Down Expand Up @@ -5033,7 +5046,7 @@ namespace eosio {
return;
auto& index = connections.get<by_host>();
if( auto i = index.find( host ); i != index.end() ) {
fc_ilog( p2p_conn_log, "disconnecting: ${cid}", ("cid", i->c->connection_id) );
fc_ilog( p2p_conn_log, "disconnecting: '${h}' - ${cid}", ("h", host)("cid", i->c->connection_id) );
i->c->close();
connections.erase(i);
}
Expand All @@ -5044,7 +5057,7 @@ namespace eosio {
std::lock_guard g( connections_mtx );
auto& index = connections.get<by_host>();
if( auto i = index.find( host ); i != index.end() ) {
fc_ilog( p2p_conn_log, "disconnecting: ${cid}", ("cid", i->c->connection_id) );
fc_ilog( p2p_conn_log, "disconnecting: '${h}' - ${cid}", ("h", host)("cid", i->c->connection_id) );
i->c->close();
connections.erase(i);
supplied_peers.erase(host);
Expand Down Expand Up @@ -5103,6 +5116,18 @@ namespace eosio {
return {};
}

// thread safe
connection_ptr connections_manager::is_other_connected( const string& peer_address, const connection_ptr& c )const {
std::shared_lock g( connections_mtx );
const auto& index = connections.get<by_host>();
const auto& r = index.equal_range(peer_address);
for (auto i = r.first; i != r.second; ++i) {
if (i->c != c && i->c->connected())
return i->c;
}
return {};
}

// called from any thread
void connections_manager::start_conn_timers() {
start_conn_timer(connector_period, {}, timer_type::check); // this locks mutex
Expand Down
Loading