Merge remote-tracking branch 'origin/main' into GH-592-ship-crash-spl…

…it-ship-log

docs/01_nodeos/03_plugins/index.md

@@ -20,7 +20,6 @@ For information on specific plugins, just select from the list below:
 * [`test_control_api_plugin`](test_control_api_plugin/index.md)
 * [`test_control_plugin`](test_control_plugin/index.md)
 * [`trace_api_plugin`](trace_api_plugin/index.md)
-* [`txn_test_gen_plugin`](txn_test_gen_plugin/index.md)
 
 [[info | Nodeos is modular]]
 | Plugins add incremental functionality to `nodeos`. Unlike runtime plugins, `nodeos` plugins are built at compile-time.

plugins/CMakeLists.txt

@@ -12,7 +12,6 @@ add_subdirectory(resource_monitor_plugin)
 add_subdirectory(signature_provider_plugin)
 add_subdirectory(wallet_plugin)
 add_subdirectory(wallet_api_plugin)
-add_subdirectory(txn_test_gen_plugin)
 add_subdirectory(db_size_api_plugin)
 add_subdirectory(test_control_plugin)
 add_subdirectory(test_control_api_plugin)

plugins/http_plugin/include/eosio/http_plugin/beast_http_listener.hpp

@@ -28,6 +28,8 @@ class beast_http_listener : public std::enable_shared_from_this<beast_http_liste
    typename protocol_type::acceptor acceptor_;
    socket_type socket_;
 
+   boost::asio::deadline_timer accept_error_timer_;
+
 public:
    beast_http_listener() = default;
    beast_http_listener(const beast_http_listener&) = delete;
@@ -36,7 +38,7 @@ class beast_http_listener : public std::enable_shared_from_this<beast_http_liste
    beast_http_listener& operator=(const beast_http_listener&) = delete;
    beast_http_listener& operator=(beast_http_listener&&) = delete;
 
-   beast_http_listener(std::shared_ptr<http_plugin_state> plugin_state) : is_listening_(false), plugin_state_(std::move(plugin_state)), acceptor_(plugin_state_->thread_pool->get_executor()), socket_(plugin_state_->thread_pool->get_executor()) {}
+   beast_http_listener(std::shared_ptr<http_plugin_state> plugin_state) : is_listening_(false), plugin_state_(std::move(plugin_state)), acceptor_(plugin_state_->thread_pool->get_executor()), socket_(plugin_state_->thread_pool->get_executor()), accept_error_timer_(plugin_state_->thread_pool->get_executor()) {}
 
    virtual ~beast_http_listener() {
       try {
@@ -106,19 +108,29 @@ class beast_http_listener : public std::enable_shared_from_this<beast_http_liste
    void do_accept() {
       auto self = this->shared_from_this();
       acceptor_.async_accept(socket_, [self](beast::error_code ec) {
-         if(ec) {
-            fail(ec, "accept", self->plugin_state_->logger, "closing connection");
+         if(ec == boost::system::errc::too_many_files_open) {
+            // retry accept() after timeout to avoid cpu loop on accept
+            fail(ec, "accept", self->plugin_state_->logger, "too many files open - waiting 500ms");
+            self->accept_error_timer_.expires_from_now(boost::posix_time::milliseconds(500));
+            self->accept_error_timer_.async_wait([self = self->shared_from_this()](beast::error_code ec) {
+               if (!ec)
+                  self->do_accept();
+            });
          } else {
-            // Create the session object and run it
-            std::make_shared<session_type>(
+            if (ec) {
+               fail(ec, "accept", self->plugin_state_->logger, "closing connection");
+            } else {
+               // Create the session object and run it
+               std::make_shared<session_type>(
                   std::move(self->socket_),
                   self->plugin_state_)
                   ->run_session();
+            }
+
+            // Accept another connection
+            self->do_accept();
          }
-
-         // Accept another connection
-         self->do_accept();
       });
    }
 };// end class beast_http_Listener
-}// namespace eosio
+}// namespace eosio

plugins/state_history_plugin/state_history_plugin.cpp

@@ -188,8 +188,8 @@ struct state_history_plugin_impl : std::enable_shared_from_this<state_history_pl
       };
 
       // create and configure acceptors, can be both
-      if (endpoint_address.size()) init_tcp_acceptor();
-      if (unix_path.size())        init_unix_acceptor();
+      if (!endpoint_address.empty()) init_tcp_acceptor();
+      if (!unix_path.empty())        init_unix_acceptor();
 
       // start it
       std::for_each(acceptors.begin(), acceptors.end(), [&](const acceptor_type& acc) {
@@ -227,15 +227,15 @@ struct state_history_plugin_impl : std::enable_shared_from_this<state_history_pl
             return;
          if (ec) {
             if (ec == boost::system::errc::too_many_files_open)
-               catch_and_log([&] { do_accept(acceptor); });
+               catch_and_log([&] { self->do_accept(acceptor); });
             return;
          }
          catch_and_log([&] {
             auto s = std::make_shared<session<std::shared_ptr<state_history_plugin_impl>, typename Acceptor::protocol_type::socket>>(self, std::move(*socket));
             s->start();
             post_task_main_thread_high([self, s]() mutable { self->session_set.insert(std::move(s)); });
          });
-         catch_and_log([&] { do_accept(acceptor); });
+         catch_and_log([&] { self->do_accept(acceptor); });
       });
    }
 
@@ -291,7 +291,7 @@ struct state_history_plugin_impl : std::enable_shared_from_this<state_history_pl
       });
    }
 
-   // calle from main thread
+   // called from main thread
    void store_chain_state(const block_state_ptr& block_state) {
       if (!chain_state_log)
          return;