diff --git a/cumulus/client/relay-chain-inprocess-interface/src/lib.rs b/cumulus/client/relay-chain-inprocess-interface/src/lib.rs
index 6ea02b2e7c1f6d9b5313459890dd2147015359e5..578b942776dcde99553e0a5af513b03acb3a80a1 100644
--- a/cumulus/client/relay-chain-inprocess-interface/src/lib.rs
+++ b/cumulus/client/relay-chain-inprocess-interface/src/lib.rs
@@ -312,6 +312,9 @@ fn build_polkadot_full_node(
overseer_message_channel_capacity_override: None,
malus_finality_delay: None,
hwbench,
+ execute_workers_max_num: None,
+ prepare_workers_hard_max_num: None,
+ prepare_workers_soft_max_num: None,
},
)?;
diff --git a/polkadot/cli/src/cli.rs b/polkadot/cli/src/cli.rs
index 3737942e6e53fb61133cf66227129dedd4bf885c..3e5a6ccdd3c25519e7890f73c3d5a1a49e41c9c8 100644
--- a/polkadot/cli/src/cli.rs
+++ b/polkadot/cli/src/cli.rs
@@ -131,6 +131,23 @@ pub struct RunCmd {
#[arg(long, value_name = "PATH")]
pub workers_path: Option<PathBuf>,
+ /// Override the maximum number of pvf execute workers.
+ ///
+ /// **Dangerous!** Do not touch unless explicitly advised to.
+ #[arg(long)]
+ pub execute_workers_max_num: Option<usize>,
+ /// Override the maximum number of pvf workers that can be spawned in the pvf prepare
+ /// pool for tasks with the priority below critical.
+ ///
+ /// **Dangerous!** Do not touch unless explicitly advised to.
+
+ #[arg(long)]
+ pub prepare_workers_soft_max_num: Option<usize>,
+ /// Override the absolute number of pvf workers that can be spawned in the pvf prepare pool.
+ ///
+ /// **Dangerous!** Do not touch unless explicitly advised to.
+ #[arg(long)]
+ pub prepare_workers_hard_max_num: Option<usize>,
/// TESTING ONLY: disable the version check between nodes and workers.
#[arg(long, hide = true)]
pub disable_worker_version_check: bool,
diff --git a/polkadot/cli/src/command.rs b/polkadot/cli/src/command.rs
index 6af93a75638891f0499029574da93dc57a291212..f5ee538e8cec5f418c0f2bb06336f78a81425cae 100644
--- a/polkadot/cli/src/command.rs
+++ b/polkadot/cli/src/command.rs
@@ -253,6 +253,9 @@ where
.overseer_channel_capacity_override,
malus_finality_delay: maybe_malus_finality_delay,
hwbench,
+ execute_workers_max_num: cli.run.execute_workers_max_num,
+ prepare_workers_hard_max_num: cli.run.prepare_workers_hard_max_num,
+ prepare_workers_soft_max_num: cli.run.prepare_workers_soft_max_num,
},
)
.map(|full| full.task_manager)?;
diff --git a/polkadot/node/core/candidate-validation/src/lib.rs b/polkadot/node/core/candidate-validation/src/lib.rs
index 8663dc43835a954a72a1a8945cd077789f1b2710..08881dad1961f4beb4249c632f3a82c8f86cc68c 100644
--- a/polkadot/node/core/candidate-validation/src/lib.rs
+++ b/polkadot/node/core/candidate-validation/src/lib.rs
@@ -100,6 +100,13 @@ pub struct Config {
pub prep_worker_path: PathBuf,
/// Path to the execution worker binary
pub exec_worker_path: PathBuf,
+ /// The maximum number of pvf execution workers.
+ pub pvf_execute_workers_max_num: usize,
+ /// The maximum number of pvf workers that can be spawned in the pvf prepare pool for tasks
+ /// with the priority below critical.
+ pub pvf_prepare_workers_soft_max_num: usize,
+ /// The absolute number of pvf workers that can be spawned in the pvf prepare pool.
+ pub pvf_prepare_workers_hard_max_num: usize,
}
/// The candidate validation subsystem.
@@ -224,6 +231,9 @@ async fn run<Context>(
secure_validator_mode,
prep_worker_path,
exec_worker_path,
+ pvf_execute_workers_max_num,
+ pvf_prepare_workers_soft_max_num,
+ pvf_prepare_workers_hard_max_num,
}: Config,
) -> SubsystemResult<()> {
let (validation_host, task) = polkadot_node_core_pvf::start(
@@ -233,6 +243,9 @@ async fn run<Context>(
secure_validator_mode,
prep_worker_path,
exec_worker_path,
+ pvf_execute_workers_max_num,
+ pvf_prepare_workers_soft_max_num,
+ pvf_prepare_workers_hard_max_num,
),
pvf_metrics,
)
diff --git a/polkadot/node/core/pvf/benches/host_prepare_rococo_runtime.rs b/polkadot/node/core/pvf/benches/host_prepare_rococo_runtime.rs
index 2aea21361a3e8fcb4114eb533539f09b1d660fc7..97a03e6596d16e2d10219331e58dd2d19647b531 100644
--- a/polkadot/node/core/pvf/benches/host_prepare_rococo_runtime.rs
+++ b/polkadot/node/core/pvf/benches/host_prepare_rococo_runtime.rs
@@ -48,6 +48,9 @@ impl TestHost {
false,
prepare_worker_path,
execute_worker_path,
+ 2,
+ 1,
+ 2,
);
f(&mut config);
let (host, task) = start(config, Metrics::default()).await.unwrap();
diff --git a/polkadot/node/core/pvf/src/host.rs b/polkadot/node/core/pvf/src/host.rs
index 2d180fc5929550805822b0ccc5b85609e466bbf6..4065598a3ac46c32b4d821aac7712f62767a973e 100644
--- a/polkadot/node/core/pvf/src/host.rs
+++ b/polkadot/node/core/pvf/src/host.rs
@@ -188,6 +188,9 @@ impl Config {
secure_validator_mode: bool,
prepare_worker_program_path: PathBuf,
execute_worker_program_path: PathBuf,
+ execute_workers_max_num: usize,
+ prepare_workers_soft_max_num: usize,
+ prepare_workers_hard_max_num: usize,
) -> Self {
Self {
cache_path,
@@ -196,12 +199,12 @@ impl Config {
prepare_worker_program_path,
prepare_worker_spawn_timeout: Duration::from_secs(3),
- prepare_workers_soft_max_num: 1,
- prepare_workers_hard_max_num: 2,
+ prepare_workers_soft_max_num,
+ prepare_workers_hard_max_num,
execute_worker_program_path,
execute_worker_spawn_timeout: Duration::from_secs(3),
- execute_workers_max_num: 2,
+ execute_workers_max_num,
}
}
}
diff --git a/polkadot/node/core/pvf/tests/it/main.rs b/polkadot/node/core/pvf/tests/it/main.rs
index 16ef23c69cad9d40d6cd79d2a754d8a347bfac3c..56cc681aff387a9401b3d54949e5076618af3c36 100644
--- a/polkadot/node/core/pvf/tests/it/main.rs
+++ b/polkadot/node/core/pvf/tests/it/main.rs
@@ -63,6 +63,9 @@ impl TestHost {
false,
prepare_worker_path,
execute_worker_path,
+ 2,
+ 1,
+ 2,
);
f(&mut config);
let (host, task) = start(config, Metrics::default()).await.unwrap();
diff --git a/polkadot/node/service/src/lib.rs b/polkadot/node/service/src/lib.rs
index 22231c84b1d9c377c24bf689e7c5a88d40dba62b..e5c29172099b4d7b73b4da089a901c63ee0e3a43 100644
--- a/polkadot/node/service/src/lib.rs
+++ b/polkadot/node/service/src/lib.rs
@@ -643,6 +643,13 @@ pub struct NewFullParams<OverseerGenerator: OverseerGen> {
pub workers_path: Option<std::path::PathBuf>,
/// Optional custom names for the prepare and execute workers.
pub workers_names: Option<(String, String)>,
+ /// An optional number of the maximum number of pvf execute workers.
+ pub execute_workers_max_num: Option<usize>,
+ /// An optional maximum number of pvf workers that can be spawned in the pvf prepare pool for
+ /// tasks with the priority below critical.
+ pub prepare_workers_soft_max_num: Option<usize>,
+ /// An optional absolute number of pvf workers that can be spawned in the pvf prepare pool.
+ pub prepare_workers_hard_max_num: Option<usize>,
pub overseer_gen: OverseerGenerator,
pub overseer_message_channel_capacity_override: Option<usize>,
#[allow(dead_code)]
@@ -738,6 +745,9 @@ pub fn new_full<
overseer_message_channel_capacity_override,
malus_finality_delay: _malus_finality_delay,
hwbench,
+ execute_workers_max_num,
+ prepare_workers_soft_max_num,
+ prepare_workers_hard_max_num,
}: NewFullParams<OverseerGenerator>,
) -> Result<NewFull, Error> {
use polkadot_node_network_protocol::request_response::IncomingRequest;
@@ -943,6 +953,16 @@ pub fn new_full<
secure_validator_mode,
prep_worker_path,
exec_worker_path,
+ pvf_execute_workers_max_num: execute_workers_max_num.unwrap_or_else(
+ || match config.chain_spec.identify_chain() {
+ // The intention is to use this logic for gradual increasing from 2 to 4
+ // of this configuration chain by chain untill it reaches production chain.
+ Chain::Polkadot | Chain::Kusama => 2,
+ Chain::Rococo | Chain::Westend | Chain::Unknown => 4,
+ },
+ ),
+ pvf_prepare_workers_soft_max_num: prepare_workers_soft_max_num.unwrap_or(1),
+ pvf_prepare_workers_hard_max_num: prepare_workers_hard_max_num.unwrap_or(2),
})
} else {
None
diff --git a/polkadot/node/test/service/src/lib.rs b/polkadot/node/test/service/src/lib.rs
index d313c19333483095291b09c79103d681961dbff6..87fbc7c20f318c6a791276f7fb509e8c33c4f909 100644
--- a/polkadot/node/test/service/src/lib.rs
+++ b/polkadot/node/test/service/src/lib.rs
@@ -97,6 +97,9 @@ pub fn new_full<OverseerGenerator: OverseerGen>(
overseer_message_channel_capacity_override: None,
malus_finality_delay: None,
hwbench: None,
+ execute_workers_max_num: None,
+ prepare_workers_hard_max_num: None,
+ prepare_workers_soft_max_num: None,
},
),
sc_network::config::NetworkBackendType::Litep2p =>
@@ -116,6 +119,9 @@ pub fn new_full<OverseerGenerator: OverseerGen>(
overseer_message_channel_capacity_override: None,
malus_finality_delay: None,
hwbench: None,
+ execute_workers_max_num: None,
+ prepare_workers_hard_max_num: None,
+ prepare_workers_soft_max_num: None,
},
),
}
diff --git a/polkadot/parachain/test-parachains/adder/collator/src/main.rs b/polkadot/parachain/test-parachains/adder/collator/src/main.rs
index fec90fc41cdb160f1a90a8ceab7a15da81e96bb2..e8588274df27aad40820d0a73e70ec5d24a89fb6 100644
--- a/polkadot/parachain/test-parachains/adder/collator/src/main.rs
+++ b/polkadot/parachain/test-parachains/adder/collator/src/main.rs
@@ -95,6 +95,9 @@ fn main() -> Result<()> {
overseer_message_channel_capacity_override: None,
malus_finality_delay: None,
hwbench: None,
+ execute_workers_max_num: None,
+ prepare_workers_hard_max_num: None,
+ prepare_workers_soft_max_num: None,
},
)
.map_err(|e| e.to_string())?;
diff --git a/polkadot/parachain/test-parachains/undying/collator/src/main.rs b/polkadot/parachain/test-parachains/undying/collator/src/main.rs
index 45f21e7b859631ec8763304c18f01cf6f3d04d10..7198a831a4771b1a70de4180149ce81ffe6f5412 100644
--- a/polkadot/parachain/test-parachains/undying/collator/src/main.rs
+++ b/polkadot/parachain/test-parachains/undying/collator/src/main.rs
@@ -97,6 +97,9 @@ fn main() -> Result<()> {
overseer_message_channel_capacity_override: None,
malus_finality_delay: None,
hwbench: None,
+ execute_workers_max_num: None,
+ prepare_workers_hard_max_num: None,
+ prepare_workers_soft_max_num: None,
},
)
.map_err(|e| e.to_string())?;
diff --git a/prdoc/pr_4252.prdoc b/prdoc/pr_4252.prdoc
new file mode 100644
index 0000000000000000000000000000000000000000..22987b46845d8382d83e4501301465643167fea4
--- /dev/null
+++ b/prdoc/pr_4252.prdoc
@@ -0,0 +1,15 @@
+title: "Add logic to increase pvf worker based on chain"
+
+doc:
+ - audience: Node Operator
+ description: |
+ A new logic and cli parameters were added to allow increasing the number of pvf
+ workers based on the chain-id.
+
+crates:
+ - name: polkadot-node-core-candidate-validation
+ bump: minor
+ - name: polkadot-cli
+ bump: minor
+ - name: polkadot-service
+ bump: minor