mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-19 16:20:50 +00:00
Fixes
This commit is contained in:
parent
cd4b56b031
commit
287cce7d21
2
.gitmodules
vendored
2
.gitmodules
vendored
@ -374,4 +374,4 @@
|
|||||||
url = https://github.com/ClickHouse/double-conversion.git
|
url = https://github.com/ClickHouse/double-conversion.git
|
||||||
[submodule "contrib/numactl"]
|
[submodule "contrib/numactl"]
|
||||||
path = contrib/numactl
|
path = contrib/numactl
|
||||||
url = https://github.com/numactl/numactl.git
|
url = https://github.com/ClickHouse/numactl.git
|
||||||
|
2
contrib/numactl
vendored
2
contrib/numactl
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 3871b1c42fc71bceadafd745d2eff5dddfc2d67e
|
Subproject commit 8d13d63a05f0c3cd88bf777cbb61541202b7da08
|
@ -13,6 +13,7 @@ entry="/usr/share/clickhouse-test/performance/scripts/entrypoint.sh"
|
|||||||
# https://www.kernel.org/doc/Documentation/filesystems/tmpfs.txt
|
# https://www.kernel.org/doc/Documentation/filesystems/tmpfs.txt
|
||||||
# Double-escaped backslashes are a tribute to the engineering wonder of docker --
|
# Double-escaped backslashes are a tribute to the engineering wonder of docker --
|
||||||
# it gives '/bin/sh: 1: [bash,: not found' otherwise.
|
# it gives '/bin/sh: 1: [bash,: not found' otherwise.
|
||||||
|
numactl --hardware
|
||||||
node=$(( RANDOM % $(numactl --hardware | sed -n 's/^.*available:\(.*\)nodes.*$/\1/p') ));
|
node=$(( RANDOM % $(numactl --hardware | sed -n 's/^.*available:\(.*\)nodes.*$/\1/p') ));
|
||||||
echo Will bind to NUMA node $node;
|
echo Will bind to NUMA node $node;
|
||||||
numactl --cpunodebind=$node --membind=$node $entry
|
numactl --cpunodebind=$node --membind=$node $entry
|
||||||
|
@ -775,9 +775,16 @@ try
|
|||||||
|
|
||||||
LOG_INFO(
|
LOG_INFO(
|
||||||
log,
|
log,
|
||||||
"ClickHouse is bound to a subset of NUMA nodes. Total memory of all available nodes {}",
|
"ClickHouse is bound to a subset of NUMA nodes. Total memory of all available nodes: {}",
|
||||||
ReadableSize(total_numa_memory));
|
ReadableSize(total_numa_memory));
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
LOG_TRACE(
|
||||||
|
log,
|
||||||
|
"All NUMA nodes are used. Detected NUMA nodes: {}",
|
||||||
|
numa_num_configured_nodes());
|
||||||
|
}
|
||||||
|
|
||||||
numa_bitmask_free(membind);
|
numa_bitmask_free(membind);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user