Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into fix-jemalloc-reporting

pull/24376/head
kodiakhq[bot] 2021-05-25 08:38:37 +00:00 committed by GitHub
parent a4215f0a56 7f4b181c67
commit 7a475dc82a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -100,7 +100,7 @@ serde_urlencoded = "0.7.0"
snafu = "0.6.9" snafu = "0.6.9"
structopt = "0.3.21" structopt = "0.3.21"
thiserror = "1.0.23" thiserror = "1.0.23"
tikv-jemallocator = "0.4.0" tikv-jemallocator = {version = "0.4.0", features = ["unprefixed_malloc_on_supported_platforms"] }
tikv-jemalloc-ctl = "0.4.0" tikv-jemalloc-ctl = "0.4.0"
tokio = { version = "1.0", features = ["macros", "rt-multi-thread", "parking_lot", "signal"] } tokio = { version = "1.0", features = ["macros", "rt-multi-thread", "parking_lot", "signal"] }
tokio-stream = { version = "0.1.2", features = ["net"] } tokio-stream = { version = "0.1.2", features = ["net"] }

9
src/influxdb_ioxd.rs
View File

@ -100,7 +100,14 @@ async fn wait_for_signal() {
pub async fn main(config: Config) -> Result<()> { pub async fn main(config: Config) -> Result<()> {
let git_hash = option_env!("GIT_HASH").unwrap_or("UNKNOWN"); let git_hash = option_env!("GIT_HASH").unwrap_or("UNKNOWN");
let num_cpus = num_cpus::get(); let num_cpus = num_cpus::get();
info!(git_hash, num_cpus, "InfluxDB IOx server starting"); let build_malloc_conf = tikv_jemalloc_ctl::config::malloc_conf::mib()
.unwrap()
.read()
.unwrap();
info!(
git_hash,
num_cpus, build_malloc_conf, "InfluxDB IOx server starting"
);
// Install custom panic handler and forget about it. // Install custom panic handler and forget about it.
// //