Skip to content

Commit 49103f9

Browse files
authored
Merge pull request #9066 from dantengsky/feat-bump-jemalloc
feat: bump jemalloc
2 parents d270763 + d8c2f8b commit 49103f9

File tree

5 files changed

+17
-8
lines changed

5 files changed

+17
-8
lines changed

.github/actions/build_linux/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ runs:
1414
uses: ./.github/actions/setup_build_tool
1515
with:
1616
image: ${{ inputs.target }}
17-
bypass_env_vars: RUSTFLAGS,RUST_LOG,RUSTC_WRAPPER,SCCACHE_BUCKET,SCCACHE_S3_KEY_PREFIX,SCCACHE_S3_USE_SSL,AWS_DEFAULT_REGION,AWS_REGION,AWS_ROLE_ARN,AWS_STS_REGIONAL_ENDPOINTS,AWS_WEB_IDENTITY_TOKEN_FILE
17+
bypass_env_vars: RUSTFLAGS,RUST_LOG,RUSTC_WRAPPER,SCCACHE_BUCKET,SCCACHE_S3_KEY_PREFIX,SCCACHE_S3_USE_SSL,AWS_DEFAULT_REGION,AWS_REGION,AWS_ROLE_ARN,AWS_STS_REGIONAL_ENDPOINTS,AWS_WEB_IDENTITY_TOKEN_FILE,je_cv_pthread_getname_np
1818

1919
- name: Build Debug
2020
if: inputs.profile == 'debug'

.github/workflows/dev-linux.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,15 @@ jobs:
6464
# fetch all tags, metasrv and metaclient need tag as its version.
6565
fetch-depth: 0
6666
- uses: ./.github/actions/build_linux
67+
env:
68+
# To avoid the `undefined reference to pthread_getname_np` error during linking,
69+
# here we override set config environment var `je_cv_pthread_getname_np` to `no`,
70+
# as suggested by tikv-jemalloc-sys's maintainer @BusyJay:
71+
# https://github.com/tikv/jemallocator/issues/30#issuecomment-1183786410
72+
#
73+
# Hopefully this trick can be removed when rust upgraded to musl 1.2.3
74+
# https://github.com/rust-lang/rust/pull/102891
75+
je_cv_pthread_getname_np: no
6776
with:
6877
target: ${{ matrix.arch }}-unknown-linux-musl
6978
profile: debug

Cargo.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/common/base/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ pprof = { version = "0.10.1", features = [
4242
] }
4343
semver = "1.0.10"
4444
serde = { workspace = true }
45-
tikv-jemalloc-ctl = { version = "0.4.2", optional = true }
46-
tikv-jemalloc-sys = "0.4.3"
45+
tikv-jemalloc-ctl = { version = "0.5.0", optional = true }
46+
tikv-jemalloc-sys = "0.5.2"
4747
tokio = { version = "1.21.1", features = ["full"] }
4848
tracing = "0.1.36"
4949
uuid = { version = "1.1.2", features = ["serde", "v4"] }

src/query/storages/system/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ serde = { workspace = true }
4242
serde_json = { workspace = true }
4343
serde_repr = "0.1.9"
4444
snailquote = "0.3.1"
45-
tikv-jemalloc-ctl = { version = "0.4.2", features = ["use_std"] }
45+
tikv-jemalloc-ctl = { version = "0.5.0", features = ["use_std"] }
4646
tracing = "0.1.36"
4747
typetag = "0.2.3"
4848
uuid = { version = "1.1.2", features = ["serde", "v4"] }

0 commit comments

Comments
 (0)