Small fixes

Author: eserilev

beacon_node/beacon_processor/src/lib.rs

@@ -120,7 +120,6 @@ pub const NOTHING_TO_DO: &str = "nothing_to_do";
 
 #[derive(Clone, PartialEq, Debug, Serialize, Deserialize)]
 pub struct BeaconProcessorConfig {
-    pub max_workers: usize,
     pub max_io_bound_workers: usize,
     pub max_cpu_bound_workers: usize,
     pub max_work_event_queue_len: usize,
@@ -133,7 +132,6 @@ pub struct BeaconProcessorConfig {
 impl Default for BeaconProcessorConfig {
     fn default() -> Self {
         Self {
-            max_workers: cmp::max(1, num_cpus::get()),
             max_io_bound_workers: MAX_IO_BOUND_WORKERS,
             max_cpu_bound_workers: cmp::max(1, num_cpus::get()),
             max_work_event_queue_len: DEFAULT_MAX_WORK_EVENT_QUEUE_LEN,
@@ -431,7 +429,7 @@ impl<E: EthSpec> BeaconProcessor<E> {
     /// - Performed immediately, if a worker is available.
     /// - Queued for later processing, if no worker is currently available.
     ///
-    /// Only `self.config.max_workers` will ever be spawned at one time. Each worker is a `tokio` task
+    /// Only `self.config.max_cpu_bound_workers + self.config.max_io_bound_workers` will ever be spawned at one time. Each worker is a `tokio` task
     /// started with `spawn_blocking`.
     ///
     /// The optional `work_journal_tx` allows for an outside process to receive a log of all work
@@ -1095,7 +1093,7 @@ impl<E: EthSpec> BeaconProcessor<E> {
             // following head.
             //
             // Check attester slashings before proposer slashings since they have the
-            // potential to slash multiple validators at once.
+            // potential to slash multiple validators at ongice.
             .or_else(|| {
                 work_queues
                     .gossip_attester_slashing_queue

beacon_node/beacon_processor/src/work.rs

@@ -166,7 +166,6 @@ impl WorkCategory {
         match work_type {
             // IO bound tasks
             WorkType::GossipAttestationToConvert
-            | WorkType::UnknownBlockAggregate
             | WorkType::UnknownLightClientOptimisticUpdate
             | WorkType::GossipVoluntaryExit
             | WorkType::GossipProposerSlashing
@@ -190,14 +189,15 @@ impl WorkCategory {
             | WorkType::LightClientUpdatesByRangeRequest
             | WorkType::ApiRequestP0
             | WorkType::ApiRequestP1
-            | WorkType::Reprocess
-            | WorkType::GossipAggregateBatch => Self::IoBound,
+            | WorkType::Reprocess => Self::IoBound,
             // CPU bound tasks
             WorkType::GossipBlock
             | WorkType::UnknownBlockAttestation
+            | WorkType::UnknownBlockAggregate
             | WorkType::GossipAttestation
             | WorkType::GossipAttestationBatch
             | WorkType::GossipAggregate
+            | WorkType::GossipAggregateBatch
             | WorkType::GossipBlobSidecar
             | WorkType::GossipDataColumnSidecar
             | WorkType::DelayedImportBlock

beacon_node/http_api/src/test_utils.rs

@@ -247,11 +247,6 @@ pub async fn create_api_server_with_config<T: BeaconChainTypes>(
     *network_globals.sync_state.write() = SyncState::Synced;
 
     let beacon_processor_config = BeaconProcessorConfig {
-        // The number of workers must be greater than one. Tests which use the
-        // builder workflow sometimes require an internal HTTP request in order
-        // to fulfill an already in-flight HTTP request, therefore having only
-        // one worker will result in a deadlock.
-        max_workers: 2,
         ..BeaconProcessorConfig::default()
     };
     let BeaconProcessorChannels {

beacon_node/src/config.rs

@@ -830,10 +830,10 @@ pub fn get_config<E: EthSpec>(
 
     if let Some(max_workers) = clap_utils::parse_optional(cli_args, "beacon-processor-max-workers")?
     {
-        client_config.beacon_processor.max_workers = max_workers;
+        client_config.beacon_processor.max_cpu_bound_workers = max_workers;
     }
 
-    if client_config.beacon_processor.max_workers == 0 {
+    if client_config.beacon_processor.max_cpu_bound_workers == 0 {
         return Err("--beacon-processor-max-workers must be a non-zero value".to_string());
     }
 

lighthouse/tests/beacon_node.rs

@@ -2684,9 +2684,8 @@ fn beacon_processor() {
             assert_eq!(
                 config.beacon_processor,
                 BeaconProcessorConfig {
-                    max_workers: 1,
-                    max_cpu_bound_workers: 0,
-                    max_io_bound_workers: 0,
+                    max_io_bound_workers: 100,
+                    max_cpu_bound_workers: 8,
                     max_work_event_queue_len: 2,
                     max_scheduled_work_queue_len: 3,
                     max_gossip_attestation_batch_size: 4,

testing/node_test_rig/src/lib.rs

@@ -120,7 +120,7 @@ pub fn testing_client_config() -> ClientConfig {
     // Specify a constant count of beacon processor workers. Having this number
     // too low can cause annoying HTTP timeouts, especially on Github runners
     // with 2 logical CPUs.
-    client_config.beacon_processor.max_workers = 4;
+    client_config.beacon_processor.max_cpu_bound_workers = 4;
 
     client_config
 }