From bc7dcf2136eedae65064e8d6772be9a987dd0820 Mon Sep 17 00:00:00 2001 From: Andrei Sandu <54316454+sandreim@users.noreply.github.com> Date: Fri, 24 Mar 2023 19:19:37 +0200 Subject: [PATCH] Subsystem channel tweaks (#6905) * subsystem tweaks for higher scale Signed-off-by: Andrei Sandu * Adjust queue sizes Signed-off-by: Andrei Sandu * Orchestra 0.0.5 Signed-off-by: Andrei Sandu * cargo lock Signed-off-by: Andrei Sandu --------- Signed-off-by: Andrei Sandu --- Cargo.lock | 8 ++++---- node/network/bridge/src/rx/mod.rs | 2 +- node/overseer/Cargo.toml | 2 +- node/overseer/src/lib.rs | 8 ++++---- node/subsystem-types/Cargo.toml | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ac3e9acc1f92..7a3dd48db4ed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5149,9 +5149,9 @@ dependencies = [ [[package]] name = "orchestra" -version = "0.0.4" +version = "0.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17e7d5b6bb115db09390bed8842c94180893dd83df3dfce7354f2a2aa090a4ee" +checksum = "227585216d05ba65c7ab0a0450a3cf2cbd81a98862a54c4df8e14d5ac6adb015" dependencies = [ "async-trait", "dyn-clonable", @@ -5166,9 +5166,9 @@ dependencies = [ [[package]] name = "orchestra-proc-macro" -version = "0.0.4" +version = "0.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2af4dabb2286b0be0e9711d2d24e25f6217048b71210cffd3daddc3b5c84e1f" +checksum = "2871aadd82a2c216ee68a69837a526dfe788ecbe74c4c5038a6acdbff6653066" dependencies = [ "expander 0.0.6", "itertools", diff --git a/node/network/bridge/src/rx/mod.rs b/node/network/bridge/src/rx/mod.rs index a6bfec77ce10..5253ada28c00 100644 --- a/node/network/bridge/src/rx/mod.rs +++ b/node/network/bridge/src/rx/mod.rs @@ -652,7 +652,7 @@ where ) .remote_handle(); - ctx.spawn("network-bridge-in-network-worker", Box::pin(task))?; + ctx.spawn_blocking("network-bridge-in-network-worker", Box::pin(task))?; futures::pin_mut!(network_event_handler); let orchestra_signal_handler = run_incoming_orchestra_signals( diff --git a/node/overseer/Cargo.toml b/node/overseer/Cargo.toml index 5d26c0b6e2bf..70a22bdcdd0a 100644 --- a/node/overseer/Cargo.toml +++ b/node/overseer/Cargo.toml @@ -15,7 +15,7 @@ polkadot-node-primitives = { path = "../primitives" } polkadot-node-subsystem-types = { path = "../subsystem-types" } polkadot-node-metrics = { path = "../metrics" } polkadot-primitives = { path = "../../primitives" } -orchestra = "0.0.4" +orchestra = "0.0.5" gum = { package = "tracing-gum", path = "../gum" } lru = "0.9" sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/node/overseer/src/lib.rs b/node/overseer/src/lib.rs index 810f08af4857..7fe0fe3652b1 100644 --- a/node/overseer/src/lib.rs +++ b/node/overseer/src/lib.rs @@ -529,7 +529,7 @@ pub struct Overseer { ])] availability_store: AvailabilityStore, - #[subsystem(NetworkBridgeRxMessage, sends: [ + #[subsystem(blocking, NetworkBridgeRxMessage, sends: [ BitfieldDistributionMessage, StatementDistributionMessage, ApprovalDistributionMessage, @@ -540,7 +540,7 @@ pub struct Overseer { ])] network_bridge_rx: NetworkBridgeRx, - #[subsystem(NetworkBridgeTxMessage, sends: [])] + #[subsystem(blocking, NetworkBridgeTxMessage, sends: [])] network_bridge_tx: NetworkBridgeTx, #[subsystem(blocking, ChainApiMessage, sends: [])] @@ -559,7 +559,7 @@ pub struct Overseer { ])] collator_protocol: CollatorProtocol, - #[subsystem(ApprovalDistributionMessage, sends: [ + #[subsystem(blocking, message_capacity: 64000, ApprovalDistributionMessage, sends: [ NetworkBridgeTxMessage, ApprovalVotingMessage, ])] @@ -584,7 +584,7 @@ pub struct Overseer { ])] gossip_support: GossipSupport, - #[subsystem(blocking, DisputeCoordinatorMessage, sends: [ + #[subsystem(blocking, message_capacity: 32000, DisputeCoordinatorMessage, sends: [ RuntimeApiMessage, ChainApiMessage, DisputeDistributionMessage, diff --git a/node/subsystem-types/Cargo.toml b/node/subsystem-types/Cargo.toml index 22528503ccc4..31bf34cd2124 100644 --- a/node/subsystem-types/Cargo.toml +++ b/node/subsystem-types/Cargo.toml @@ -13,7 +13,7 @@ polkadot-node-primitives = { path = "../primitives" } polkadot-node-network-protocol = { path = "../network/protocol" } polkadot-statement-table = { path = "../../statement-table" } polkadot-node-jaeger = { path = "../jaeger" } -orchestra = "0.0.4" +orchestra = "0.0.5" sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }