Fix polkadot-node-core-pvf-prepare-worker build with jemalloc#1315
Merged
Morganamilo merged 4 commits intomasterfrom Aug 31, 2023
Merged
Fix polkadot-node-core-pvf-prepare-worker build with jemalloc#1315Morganamilo merged 4 commits intomasterfrom
Morganamilo merged 4 commits intomasterfrom
Conversation
The jemalloc feature on polkadot-node-core-pvf-prepare-worker depended on some feature gated code in polkadot-node-core-pvf-common but there way no way to enable this feature gate. This commit adds the feature and makes prepare-worker enable it.
Morganamilo
added
the
T8-polkadot
bkchr
approved these changes
Aug 30, 2023
mrcnski
suggested changes
Aug 31, 2023
Contributor
mrcnski
left a comment
mrcnski
left a comment
There was a problem hiding this comment.
Thank you! Looks like it was lost when we split up the pvf crates. Few more issues:
- The
tikv-jemalloc-ctldependency can be removed fromexecute-worker/Cargo.toml(note that it's listed twice). - The
jemalloc-allocatorfeature can be added topvf/Cargo.toml, it should list"polkadot-node-core-pvf-common/jemalloc-allocator". - The
jemalloc-allocatorfeature inpolkadot/Cargo.tomlshould listpolkadot-node-core-pvf. - The
tikv-jemallocatordep inpolkadot/Cargo.tomlcan be made optional, and added to the Linux-specific list of deps (same as was done inexecute-worker/Cargo.toml). - Maybe there should be a CI job that runs
cargo checkon non-Linux with this feature enabled?
Phew, that's a lot. I can take care of it, I'll just need help with (5). Thanks again!!
|
The CI pipeline was cancelled due to failure one of the required jobs. |
Contributor
Author
|
Thanks for being more in the know about this and fixing the other issues. |
Contributor
|
No problem! It's my fault for missing this. @paritytech/ci would be great to have this job if we don't already have it:
|
Morganamilo
requested review from
a team,
alvicsam,
mrcnski and
s0me0ne-unkn0wn
ordian
approved these changes
Aug 31, 2023
mrcnski
approved these changes
Aug 31, 2023
ordian
added a commit
that referenced
this pull request
Sep 1, 2023
* master: (25 commits) fix typos (#1339) Use bandersnatch-vrfs with locked dependencies ref (#1342) Bump bs58 from 0.4.0 to 0.5.0 (#1293) Contracts: `seal0::balance` should return the free balance (#1254) Logs: add extra debug log for negative rep changes (#1205) Added short-benchmarks for cumulus (#1183) [xcm-emulator] Improve hygiene and clean up (#1301) Bump the known_good_semver group with 1 update (#1347) Renames API (#1186) Rename `polkadot-parachain` to `polkadot-parachain-primitives` (#1334) Add README to project root (#1253) Add environmental variable to track decoded instructions (#1320) Fix polkadot-node-core-pvf-prepare-worker build with jemalloc (#1315) Sassafras primitives (#1249) Restructure `dispatch` macro related exports (#1162) backing: move the min votes threshold to the runtime (#1200) Bump zstd from 0.11.2+zstd.1.5.2 to 0.12.4 (#1326) Remove `substrate_test_utils::test` (#1321) remove disable-runtime-api (#1328) [ci] add more jobs for pipeline cancel, cleanup (#1314) ...
Daanvdplas
pushed a commit
that referenced
this pull request
Sep 11, 2023
* Fix polkadot-node-core-pvf-prepare-worker build with jemalloc The jemalloc feature on polkadot-node-core-pvf-prepare-worker depended on some feature gated code in polkadot-node-core-pvf-common but there way no way to enable this feature gate. This commit adds the feature and makes prepare-worker enable it. * More jemalloc-allocator fixes * Fix jemalloc-allocator feature dep * Run `zepter format features` --------- Co-authored-by: Marcin S <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The jemalloc feature on polkadot-node-core-pvf-prepare-worker depended on some feature gated code in polkadot-node-core-pvf-common but there way no way to enable this feature gate.
This commit adds the feature and makes prepare-worker enable it.