GH-3 Make vote processor thread pool size configurable including disa…

…bling vote processing
AntelopeIO · Apr 11, 2024 · 6b0c4c4 · 6b0c4c4
1 parent c3a9c95
commit 6b0c4c4
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 7 deletions.
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
@@ -1194,11 +1194,13 @@ struct controller_impl {
     my_finalizers(fc::time_point::now(), cfg.finalizers_dir / "safety.dat"),
     wasmif( conf.wasm_runtime, conf.eosvmoc_tierup, db, conf.state_dir, conf.eosvmoc_config, !conf.profile_accounts.empty() )
    {
-      thread_pool.start( cfg.thread_pool_size, [this]( const fc::exception& e ) {
+      thread_pool.start( cfg.chain_thread_pool_size, [this]( const fc::exception& e ) {
          elog( "Exception in chain thread pool, exiting: ${e}", ("e", e.to_detail_string()) );
          if( shutdown ) shutdown();
       } );
-      vote_processor.start(4);
+      if (cfg.vote_thread_pool_size > 0) {
+         vote_processor.start(cfg.vote_thread_pool_size);
+      }
 
       set_activation_handler<builtin_protocol_feature_t::preactivate_feature>();
       set_activation_handler<builtin_protocol_feature_t::replace_deferred>();
@@ -3558,7 +3560,9 @@ struct controller_impl {
 
    // called from net threads and controller's thread pool
    void process_vote_message( uint32_t connection_id, const vote_message& vote ) {
-      vote_processor.process_vote_message(connection_id, vote);
+      if (conf.vote_thread_pool_size > 0) {
+         vote_processor.process_vote_message(connection_id, vote);
+      }
    }
 
    bool node_has_voted_if_finalizer(const block_id_type& id) const {

diff --git a/libraries/chain/include/eosio/chain/config.hpp b/libraries/chain/include/eosio/chain/config.hpp
@@ -80,6 +80,7 @@ const static uint16_t   default_max_auth_depth                       = 6;
 const static uint32_t   default_sig_cpu_bill_pct                     = 50 * percent_1; // billable percentage of signature recovery
 const static uint32_t   default_produce_block_offset_ms              = 450;
 const static uint16_t   default_controller_thread_pool_size          = 2;
+const static uint16_t   default_vote_thread_pool_size                = 4;
 const static uint32_t   default_max_variable_signature_length        = 16384u;
 const static uint32_t   default_max_action_return_value_size         = 256;
 

diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
@@ -88,7 +88,8 @@ namespace eosio::chain {
             uint64_t                 state_size             =  chain::config::default_state_size;
             uint64_t                 state_guard_size       =  chain::config::default_state_guard_size;
             uint32_t                 sig_cpu_bill_pct       =  chain::config::default_sig_cpu_bill_pct;
-            uint16_t                 thread_pool_size       =  chain::config::default_controller_thread_pool_size;
+            uint16_t                 chain_thread_pool_size =  chain::config::default_controller_thread_pool_size;
+            uint16_t                 vote_thread_pool_size  =  chain::config::default_vote_thread_pool_size;
             bool                     read_only              =  false;
             bool                     force_all_checks       =  false;
             bool                     disable_replay_opts    =  false;

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
@@ -291,6 +291,8 @@ void chain_plugin::set_program_options(options_description& cli, options_descrip
           "Percentage of actual signature recovery cpu to bill. Whole number percentages, e.g. 50 for 50%")
          ("chain-threads", bpo::value<uint16_t>()->default_value(config::default_controller_thread_pool_size),
           "Number of worker threads in controller thread pool")
+         ("vote-threads", bpo::value<uint16_t>()->default_value(config::default_vote_thread_pool_size),
+          "Number of worker threads in vote processor thread pool. Voting disabled if set to 0 (votes are not propagatged on P2P network).")
          ("contracts-console", bpo::bool_switch()->default_value(false),
           "print contract's output to console")
          ("deep-mind", bpo::bool_switch()->default_value(false),
@@ -632,9 +634,17 @@ void chain_plugin_impl::plugin_initialize(const variables_map& options) {
       }
 
       if( options.count( "chain-threads" )) {
-         chain_config->thread_pool_size = options.at( "chain-threads" ).as<uint16_t>();
-         EOS_ASSERT( chain_config->thread_pool_size > 0, plugin_config_exception,
-                     "chain-threads ${num} must be greater than 0", ("num", chain_config->thread_pool_size) );
+         chain_config->chain_thread_pool_size = options.at( "chain-threads" ).as<uint16_t>();
+         EOS_ASSERT( chain_config->chain_thread_pool_size > 0, plugin_config_exception,
+                     "chain-threads ${num} must be greater than 0", ("num", chain_config->chain_thread_pool_size) );
+      }
+
+      if( options.count( "vote-threads" )) {
+         chain_config->vote_thread_pool_size = options.at( "vote-threads" ).as<uint16_t>();
+         EOS_ASSERT( chain_config->vote_thread_pool_size > 1 || chain_config->vote_thread_pool_size == 0, plugin_config_exception,
+                     "vote-threads ${num} must be greater than 1 or 0. "
+                     "Voting disabled if set to 0 (votes are not propagatged on P2P network).",
+                     ("num", chain_config->vote_thread_pool_size) );
       }
 
       chain_config->sig_cpu_bill_pct = options.at("signature-cpu-billable-pct").as<uint32_t>();