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

Better handling of TCP accept overflow (#1638)

Browse source
This commit is contained in:
Roy Keene 2019-01-27 18:47:47 -06:00 • committed by GitHub
commit b97581fdbb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

36
nano/node/bootstrap.cpp
View file

@ -1884,6 +1884,7 @@ void nano::bootstrap_initiator::notify_listeners (bool in_progress_a)
nano::bootstrap_listener::bootstrap_listener (boost::asio::io_context & io_ctx_a, uint16_t port_a, nano::node & node_a) :
acceptor (io_ctx_a),
defer_acceptor (io_ctx_a),
local (boost::asio::ip::tcp::endpoint (boost::asio::ip::address_v6::any (), port_a)),
io_ctx (io_ctx_a),
node (node_a)
@ -1928,26 +1929,49 @@ void nano::bootstrap_listener::stop ()
void nano::bootstrap_listener::accept_connection ()
{
auto socket (std::make_shared<nano::socket> (node.shared ()));
acceptor.async_accept (socket->socket_m, [this, socket](boost::system::error_code const & ec) {
accept_action (ec, socket);
});
if (acceptor.is_open ())
{
if (connections.size () < node.config.bootstrap_connections_max)
{
auto socket (std::make_shared<nano::socket> (node.shared ()));
acceptor.async_accept (socket->socket_m, [this, socket](boost::system::error_code const & ec) {
accept_action (ec, socket);
});
}
else
{
BOOST_LOG (node.log) << boost::str (boost::format ("Unable to accept new TCP network sockets (have %1% concurrent connections, limit of %2%), will try to accept again in 1s") % connections.size () % node.config.bootstrap_connections_max);
defer_acceptor.expires_after (std::chrono::seconds (1));
defer_acceptor.async_wait ([this](const boost::system::error_code & ec) {
/*
* There should be no other call points that can invoke
* accept_connect() after starting the listener, so if we
* get an error from the I/O context, something is probably
* wrong.
*/
if (!ec)
{
accept_connection ();
}
});
}
}
}
void nano::bootstrap_listener::accept_action (boost::system::error_code const & ec, std::shared_ptr<nano::socket> socket_a)
{
if (!ec)
{
accept_connection ();
auto connection (std::make_shared<nano::bootstrap_server> (socket_a, node.shared ()));
{
std::lock_guard<std::mutex> lock (mutex);
if (connections.size () < node.config.bootstrap_connections_max && acceptor.is_open ())
if (acceptor.is_open ())
{
connections[connection.get ()] = connection;
connection->receive ();
}
}
accept_connection ();
}
else
{

3
nano/node/bootstrap.hpp
View file

@ -259,6 +259,9 @@ public:
boost::asio::io_context & io_ctx;
nano::node & node;
bool on;
private:
boost::asio::steady_timer defer_acceptor;
};
class message;
class bootstrap_server : public std::enable_shared_from_this<nano::bootstrap_server>