Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set max_threads according to the number of physical cpu cores #6481

Merged
merged 6 commits into from
Dec 15, 2022
Merged

Set max_threads according to the number of physical cpu cores #6481

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d035d13
init
xzhangxian1008 Dec 12, 2022
d21cf1a
format
xzhangxian1008 Dec 12, 2022
68df6fd
resolve comments
xzhangxian1008 Dec 14, 2022
9772699
tweaking
xzhangxian1008 Dec 14, 2022
4e8bfb4
format
xzhangxian1008 Dec 14, 2022
5f7408d
Merge branch 'master' of https://github.com/pingcap/tiflash into fix_…
xzhangxian1008 Dec 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions ...src/Common/getNumberOfLogicalCPUCores.cpp → dbms/src/Common/getNumberOfCPUCores.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include <Common/getNumberOfLogicalCPUCores.h>
#include <Common/getNumberOfCPUCores.h>
#include <common/types.h>

namespace CPUCores
{
UInt16 number_of_logical_cpu_cores = std::thread::hardware_concurrency();
UInt16 number_of_physical_cpu_cores = std::thread::hardware_concurrency() / 2;
} // namespace CPUCores


Expand All @@ -25,10 +27,21 @@ UInt16 getNumberOfLogicalCPUCores()
return CPUCores::number_of_logical_cpu_cores;
}

UInt16 getNumberOfPhysicalCPUCores()
{
return CPUCores::number_of_physical_cpu_cores;
}

// We should call this function before Context has been created,
// which will call `getNumberOfLogicalCPUCores`, or we can not
// set cpu cores any more.
void setNumberOfLogicalCPUCores(UInt16 max_logical_cpu_cores)
void setNumberOfLogicalCPUCores(UInt16 number_of_logical_cpu_cores_)
{
CPUCores::number_of_logical_cpu_cores = number_of_logical_cpu_cores_;
}

void setNumberOfPhysicalCPUCores(UInt16 number_of_logical_cpu_cores_, UInt16 number_of_hardware_physical_cores)
xzhangxian1008 marked this conversation as resolved.
Show resolved Hide resolved
{
CPUCores::number_of_logical_cpu_cores = max_logical_cpu_cores;
auto hardware_logical_cpu_cores = std::thread::hardware_concurrency();
CPUCores::number_of_physical_cpu_cores = number_of_logical_cpu_cores_ / (hardware_logical_cpu_cores / number_of_hardware_physical_cores);
xzhangxian1008 marked this conversation as resolved.
Show resolved Hide resolved
}
5 changes: 4 additions & 1 deletion dbms/src/Common/getNumberOfLogicalCPUCores.h → dbms/src/Common/getNumberOfCPUCores.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@
#include <thread>

UInt16 getNumberOfLogicalCPUCores();
UInt16 getNumberOfPhysicalCPUCores();

// We should call this function before Context has been created,
// which will call `getNumberOfLogicalCPUCores`, or we can not
// set cpu cores any more.
void setNumberOfLogicalCPUCores(UInt16 max_logical_cpu_cores);
void setNumberOfLogicalCPUCores(UInt16 number_of_logical_cpu_cores_);

void setNumberOfPhysicalCPUCores(UInt16 number_of_logical_cpu_cores, UInt16 number_of_hardware_physical_cores);
2 changes: 1 addition & 1 deletion dbms/src/Flash/FlashService.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <Common/ThreadMetricUtil.h>
#include <Common/TiFlashMetrics.h>
#include <Common/VariantOp.h>
#include <Common/getNumberOfLogicalCPUCores.h>
#include <Common/getNumberOfCPUCores.h>
#include <Common/setThreadName.h>
#include <Flash/BatchCoprocessorHandler.h>
#include <Flash/EstablishCall.h>
Expand Down
2 changes: 1 addition & 1 deletion dbms/src/Flash/Mpp/MinTSOScheduler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#include <Common/FailPoint.h>
#include <Common/TiFlashMetrics.h>
#include <Common/getNumberOfLogicalCPUCores.h>
#include <Common/getNumberOfCPUCores.h>
#include <Flash/Mpp/MPPTaskManager.h>
#include <Flash/Mpp/MinTSOScheduler.h>

Expand Down
4 changes: 2 additions & 2 deletions dbms/src/Interpreters/SettingsCommon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include <Common/Checksum.h>
#include <Common/FieldVisitors.h>
#include <Common/getNumberOfLogicalCPUCores.h>
#include <Common/getNumberOfCPUCores.h>
#include <Core/Field.h>
#include <DataStreams/SizeLimits.h>
#include <IO/CompressedStream.h>
Expand Down Expand Up @@ -167,7 +167,7 @@ struct SettingMaxThreads

static UInt64 getAutoValue()
{
static auto res = getNumberOfLogicalCPUCores();
static auto res = getNumberOfPhysicalCPUCores();
return res;
}

Expand Down
4 changes: 3 additions & 1 deletion dbms/src/Server/Server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include <Common/formatReadable.h>
#include <Common/getFQDNOrHostName.h>
#include <Common/getMultipleKeysFromConfig.h>
#include <Common/getNumberOfLogicalCPUCores.h>
#include <Common/getNumberOfCPUCores.h>
#include <Common/setThreadName.h>
#include <Core/TiFlashDisaggregatedMode.h>
#include <Encryption/DataKeyManager.h>
Expand Down Expand Up @@ -886,11 +886,13 @@ int Server::main(const std::vector<std::string> & /*args*/)
helper->fn_server_info(helper->proxy_ptr, strIntoView(&req), &response);
server_info.parseSysInfo(response);
setNumberOfLogicalCPUCores(server_info.cpu_info.logical_cores);
setNumberOfPhysicalCPUCores(server_info.cpu_info.logical_cores, server_info.cpu_info.physical_cores);
LOG_INFO(log, "ServerInfo: {}", server_info.debugString());
}
else
{
setNumberOfLogicalCPUCores(std::thread::hardware_concurrency());
setNumberOfPhysicalCPUCores(std::thread::hardware_concurrency(), std::thread::hardware_concurrency() / 2);
LOG_INFO(log, "TiFlashRaftProxyHelper is null, failed to get server info");
}

Expand Down