Skip to content

Commit 74fc205

Browse files
paritytech-release-backport-bot[bot]bkchrgithub-actions[bot]
authored
[stable2512] Backport #10590 (#10603)
Backport #10590 into `stable2512` from bkchr. See the [documentation](https://github.com/paritytech/polkadot-sdk/blob/master/docs/BACKPORT.md) on how to use this bot. <!-- # To be used by other automation, do not modify: original-pr-number: #${pull_number} --> Co-authored-by: Bastian Köcher <[email protected]> Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent dd54f65 commit 74fc205

File tree

5 files changed

+19
-1
lines changed

5 files changed

+19
-1
lines changed

polkadot/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ runtime-metrics = ["polkadot-cli/runtime-metrics"]
101101
pyroscope = ["polkadot-cli/pyroscope"]
102102
jemalloc-allocator = [
103103
"dep:tikv-jemallocator",
104+
"polkadot-cli/jemalloc-allocator",
104105
"polkadot-node-core-pvf-prepare-worker/jemalloc-allocator",
105106
"polkadot-node-core-pvf/jemalloc-allocator",
106107
"polkadot-overseer/jemalloc-allocator",

polkadot/cli/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,4 @@ runtime-metrics = [
8282
"polkadot-node-metrics/runtime-metrics",
8383
"polkadot-service/runtime-metrics",
8484
]
85+
jemalloc-allocator = ["sc-service?/jemalloc-allocator"]

prdoc/pr_10590.prdoc

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
title: 'sc-client-db: Make `jemalloc` optional'
2+
doc:
3+
- audience: Node Dev
4+
description: |-
5+
This changes `sc-client-db` to not always enable `jemalloc` by default for rocksdb. Instead it is now controlled by `jemalloc-allocator` feature. This is now also forwarded up to `polkadot` via `polkadot-cli` and `sc-service`. There we ultimately decide if `jemalloc` should be enabled or not.
6+
crates:
7+
- name: polkadot
8+
bump: minor
9+
- name: polkadot-cli
10+
bump: minor
11+
- name: sc-client-db
12+
bump: minor
13+
- name: sc-service
14+
bump: minor

substrate/client/db/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ codec = { features = ["derive"], workspace = true, default-features = true }
2727
hash-db = { workspace = true, default-features = true }
2828
kvdb = { workspace = true }
2929
kvdb-memorydb = { workspace = true }
30-
kvdb-rocksdb = { optional = true, workspace = true, features = ["jemalloc"] }
30+
kvdb-rocksdb = { optional = true, workspace = true }
3131
linked-hash-map = { workspace = true }
3232
log = { workspace = true, default-features = true }
3333
parity-db = { workspace = true }
@@ -63,3 +63,4 @@ runtime-benchmarks = [
6363
"sp-runtime/runtime-benchmarks",
6464
]
6565
rocksdb = ["kvdb-rocksdb", "sp-database/rocksdb"]
66+
jemalloc-allocator = ["kvdb-rocksdb?/jemalloc"]

substrate/client/service/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,3 +87,4 @@ runtime-benchmarks = [
8787
"sc-client-db/runtime-benchmarks",
8888
"sp-runtime/runtime-benchmarks",
8989
]
90+
jemalloc-allocator = ["sc-client-db/jemalloc-allocator"]

0 commit comments

Comments
 (0)