mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-26 07:37:57 +00:00
overseer becomes orchestra (#5542)
* rename overseer-gen to orchestra Also drop `gum` and use `tracing`. * make orchestra compile as standalone * introduce Spawner trait to split from sp_core Finalizes the independence of orchestra from polkadot-overseer * slip of the pen * other fixins * remove unused import * Update node/overseer/orchestra/proc-macro/src/impl_builder.rs Co-authored-by: Vsevolod Stakhov <vsevolod.stakhov@parity.io> * Update node/overseer/orchestra/proc-macro/src/impl_builder.rs Co-authored-by: Vsevolod Stakhov <vsevolod.stakhov@parity.io> * orchestra everywhere * leaky data * Bump scale-info from 2.1.1 to 2.1.2 (#5552) Bumps [scale-info](https://github.com/paritytech/scale-info) from 2.1.1 to 2.1.2. - [Release notes](https://github.com/paritytech/scale-info/releases) - [Changelog](https://github.com/paritytech/scale-info/blob/master/CHANGELOG.md) - [Commits](https://github.com/paritytech/scale-info/compare/v2.1.1...v2.1.2) --- updated-dependencies: - dependency-name: scale-info dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add missing markdown code block delimiter (#5555) * bitfield-signing: remove util::jobs usage (#5523) * Switch to pooling copy-on-write instantiation strategy for WASM (companion for Substrate#11232) (#5337) * Switch to pooling copy-on-write instantiation strategy for WASM * Fix compilation of `polkadot-test-service` * Update comments * Move `max_memory_size` to `Semantics` * Rename `WasmInstantiationStrategy` to `WasmtimeInstantiationStrategy` * Update a safety comment * update lockfile for {"substrate"} Co-authored-by: parity-processbot <> * Fix build Co-authored-by: Vsevolod Stakhov <vsevolod.stakhov@parity.io> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Malte Kliemann <mail@maltekliemann.com> Co-authored-by: Chris Sosnin <48099298+slumber@users.noreply.github.com> Co-authored-by: Koute <koute@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
d9eff4ecd4
commit
450ca2baca
@@ -41,7 +41,7 @@ use polkadot_node_subsystem::{
|
||||
messages::{
|
||||
CollatorProtocolMessage, NetworkBridgeEvent, NetworkBridgeMessage, RuntimeApiMessage,
|
||||
},
|
||||
overseer, FromOverseer, OverseerSignal, PerLeafSpan,
|
||||
overseer, FromOrchestra, OverseerSignal, PerLeafSpan,
|
||||
};
|
||||
use polkadot_node_subsystem_util::{
|
||||
metrics::{self, prometheus},
|
||||
@@ -1012,15 +1012,15 @@ pub(crate) async fn run<Context>(
|
||||
pin_mut!(recv_req);
|
||||
select! {
|
||||
msg = ctx.recv().fuse() => match msg.map_err(FatalError::SubsystemReceive)? {
|
||||
FromOverseer::Communication { msg } => {
|
||||
FromOrchestra::Communication { msg } => {
|
||||
log_error(
|
||||
process_msg(&mut ctx, &mut runtime, &mut state, msg).await,
|
||||
"Failed to process message"
|
||||
)?;
|
||||
},
|
||||
FromOverseer::Signal(ActiveLeaves(_update)) => {}
|
||||
FromOverseer::Signal(BlockFinalized(..)) => {}
|
||||
FromOverseer::Signal(Conclude) => return Ok(()),
|
||||
FromOrchestra::Signal(ActiveLeaves(_update)) => {}
|
||||
FromOrchestra::Signal(BlockFinalized(..)) => {}
|
||||
FromOrchestra::Signal(Conclude) => return Ok(()),
|
||||
},
|
||||
(relay_parent, peer_id) = state.active_collation_fetches.select_next_some() => {
|
||||
let next = if let Some(waiting) = state.waiting_collation_fetches.get_mut(&relay_parent) {
|
||||
|
||||
@@ -228,7 +228,7 @@ const TIMEOUT: Duration = Duration::from_millis(100);
|
||||
async fn overseer_send(overseer: &mut VirtualOverseer, msg: CollatorProtocolMessage) {
|
||||
gum::trace!(?msg, "sending message");
|
||||
overseer
|
||||
.send(FromOverseer::Communication { msg })
|
||||
.send(FromOrchestra::Communication { msg })
|
||||
.timeout(TIMEOUT)
|
||||
.await
|
||||
.expect(&format!("{:?} is more than enough for sending messages.", TIMEOUT));
|
||||
@@ -254,7 +254,7 @@ async fn overseer_recv_with_timeout(
|
||||
|
||||
async fn overseer_signal(overseer: &mut VirtualOverseer, signal: OverseerSignal) {
|
||||
overseer
|
||||
.send(FromOverseer::Signal(signal))
|
||||
.send(FromOrchestra::Signal(signal))
|
||||
.timeout(TIMEOUT)
|
||||
.await
|
||||
.expect(&format!("{:?} is more than enough for sending signals.", TIMEOUT));
|
||||
|
||||
@@ -50,7 +50,7 @@ use polkadot_node_subsystem::{
|
||||
CandidateBackingMessage, CollatorProtocolMessage, IfDisconnected, NetworkBridgeEvent,
|
||||
NetworkBridgeMessage, RuntimeApiMessage,
|
||||
},
|
||||
overseer, FromOverseer, OverseerSignal, PerLeafSpan, SubsystemSender,
|
||||
overseer, FromOrchestra, OverseerSignal, PerLeafSpan, SubsystemSender,
|
||||
};
|
||||
use polkadot_node_subsystem_util::metrics::{self, prometheus};
|
||||
use polkadot_primitives::v2::{CandidateReceipt, CollatorId, Hash, Id as ParaId};
|
||||
@@ -1206,7 +1206,7 @@ pub(crate) async fn run<Context>(
|
||||
select! {
|
||||
res = ctx.recv().fuse() => {
|
||||
match res {
|
||||
Ok(FromOverseer::Communication { msg }) => {
|
||||
Ok(FromOrchestra::Communication { msg }) => {
|
||||
gum::trace!(target: LOG_TARGET, msg = ?msg, "received a message");
|
||||
process_msg(
|
||||
&mut ctx,
|
||||
@@ -1215,8 +1215,8 @@ pub(crate) async fn run<Context>(
|
||||
&mut state,
|
||||
).await;
|
||||
}
|
||||
Ok(FromOverseer::Signal(OverseerSignal::Conclude)) | Err(_) => break,
|
||||
Ok(FromOverseer::Signal(_)) => continue,
|
||||
Ok(FromOrchestra::Signal(OverseerSignal::Conclude)) | Err(_) => break,
|
||||
Ok(FromOrchestra::Signal(_)) => continue,
|
||||
}
|
||||
}
|
||||
_ = next_inactivity_stream.next() => {
|
||||
|
||||
@@ -168,7 +168,7 @@ const TIMEOUT: Duration = Duration::from_millis(200);
|
||||
async fn overseer_send(overseer: &mut VirtualOverseer, msg: CollatorProtocolMessage) {
|
||||
gum::trace!("Sending message:\n{:?}", &msg);
|
||||
overseer
|
||||
.send(FromOverseer::Communication { msg })
|
||||
.send(FromOrchestra::Communication { msg })
|
||||
.timeout(TIMEOUT)
|
||||
.await
|
||||
.expect(&format!("{:?} is enough for sending messages.", TIMEOUT));
|
||||
@@ -194,7 +194,7 @@ async fn overseer_recv_with_timeout(
|
||||
|
||||
async fn overseer_signal(overseer: &mut VirtualOverseer, signal: OverseerSignal) {
|
||||
overseer
|
||||
.send(FromOverseer::Signal(signal))
|
||||
.send(FromOrchestra::Signal(signal))
|
||||
.timeout(TIMEOUT)
|
||||
.await
|
||||
.expect(&format!("{:?} is more than enough for sending signals.", TIMEOUT));
|
||||
|
||||
Reference in New Issue
Block a user