Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

overseer becomes orchestra #5542

Merged
merged 16 commits into from
May 19, 2022
Merged

Conversation

drahnr
Copy link
Contributor

@drahnr drahnr commented May 17, 2022

  • move from metered-channel to prioritized-metered-channel, not part of this PR, required for crates-io publishing, but also Avoid using unbounded channels for prioritization polkadot-sdk#824
  • renames the proc-macro overlord to orchestra
  • renames all Overseer suffixed/prefixed types to be Orchestra suffixed/prefixed, i.e. FromOverseer -> FromOrchestra, ToOrchestra, OrchestraError etc
  • Decoupling was harder than anticipated, particularly the trait SpawnNamed caused some trouble here, which required struct SpawnGlue<S: SpawnNamed> being introduced to bridge the sc_core::traits::SpawnNamed with the trait orchestra::Spawner which are both foreign to polkadot-overseer. Currently this type is leaked, but should be eventually be hidden inside the TestContext and friends, such that inpolkadot-overseer only S: SpawnNamed exists and are the converted internally (I leave this open what it exactly means, at this point in time within the OverseerGen and helper fns). This is an integration beauty issue and not so much a reason to delay the merge of this PR.

@github-actions github-actions bot added the A3-in_progress Pull request is in progress. No review needed at this stage. label May 17, 2022
@drahnr drahnr force-pushed the bernhard-overseer-becomes-orchestra branch from e7b3b96 to 5f18713 Compare May 18, 2022 20:49
@drahnr drahnr marked this pull request as ready for review May 18, 2022 20:54
@drahnr drahnr added B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. labels May 18, 2022
@drahnr drahnr requested review from sandreim and vstakhov May 18, 2022 21:00
drahnr added 3 commits May 19, 2022 08:04
Also drop `gum` and use `tracing`.
Finalizes the independence of orchestra from polkadot-overseer
@drahnr drahnr force-pushed the bernhard-overseer-becomes-orchestra branch from 5f18713 to a8a81a5 Compare May 19, 2022 06:06
Copy link
Contributor

@vstakhov vstakhov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd suggest some small neats.

node/overseer/orchestra/proc-macro/src/impl_builder.rs Outdated Show resolved Hide resolved
node/overseer/orchestra/proc-macro/src/impl_builder.rs Outdated Show resolved Hide resolved
node/overseer/orchestra/src/lib.rs Show resolved Hide resolved
drahnr and others added 2 commits May 19, 2022 10:32
Co-authored-by: Vsevolod Stakhov <vsevolod.stakhov@parity.io>
Co-authored-by: Vsevolod Stakhov <vsevolod.stakhov@parity.io>
Copy link
Contributor

@sandreim sandreim left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: file names still reference overseer - node/overseer/orchestra/proc-macro/src/parse/parse_overseer_struct.rs. Otherwise LGTM.

drahnr and others added 8 commits May 19, 2022 12:59
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](paritytech/scale-info@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>
…anion 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 <>
@drahnr
Copy link
Contributor Author

drahnr commented May 19, 2022

bot merge

@paritytech-processbot
Copy link

Waiting for commit status.

@paritytech-processbot
Copy link

Merge cancelled due to error. Error: Statuses failed for ba313b7

"node/overseer/overseer-gen",
"node/overseer/overseer-gen/proc-macro",
"node/overseer/orchestra",
"node/overseer/orchestra/proc-macro",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so now we have overseer and orchestra :P

Copy link
Contributor Author

@drahnr drahnr May 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The overseer is the polkadot specific (package polkadot-overseer) where orchestra is the framework which was previously overseer-gen (and overseer-gen-proc-macro).

And a few types are leaking still, but that's a thing for another PR to add proper pub use FromOrchestra as FromOverseer; (i.e.) for consistency to create proper abstraction layers. Halfway there 💦

@vstakhov vstakhov merged commit 64f0948 into master May 19, 2022
@vstakhov vstakhov deleted the bernhard-overseer-becomes-orchestra branch May 19, 2022 12:42
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A3-in_progress Pull request is in progress. No review needed at this stage. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants