Skip to content

merge to stable-25-2-1 YQ-4639 fixed CPU limiting in composite conveyor #24265

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

Merged
merged 1 commit into from
Sep 5, 2025
Merged

merge to stable-25-2-1 YQ-4639 fixed CPU limiting in composite conveyor #24265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion ydb/core/tx/columnshard/engines/reader/abstract/read_context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "read_context.h"

#include <ydb/core/resource_pools/resource_pool_settings.h>
#include <ydb/core/tx/columnshard/engines/reader/common_reader/constructor/resolver.h>
#include <ydb/core/tx/conveyor_composite/usage/service.h>

Expand All @@ -25,7 +26,7 @@ TReadContext::TReadContext(const std::shared_ptr<IStoragesManager>& storagesMana
, ResourceSubscribeActorId(resourceSubscribeActorId)
, ReadCoordinatorActorId(readCoordinatorActorId)
, ComputeShardingPolicy(computeShardingPolicy)
, ConveyorProcessGuard(NConveyorComposite::TScanServiceOperator::StartProcess(ScanId, ::ToString(ScanId), cpuLimits))
, ConveyorProcessGuard(NConveyorComposite::TScanServiceOperator::StartProcess(ScanId, cpuLimits.GetCPUGroupNameDef(NResourcePool::DEFAULT_POOL_ID), cpuLimits))
{
Y_ABORT_UNLESS(ReadMetadata);
if (ReadMetadata->HasResultSchema()) {
Expand Down
5 changes: 3 additions & 2 deletions ydb/core/tx/columnshard/engines/reader/abstract/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ SRCS(
)

PEERDIR(
ydb/core/tx/columnshard/engines/scheme/versions
ydb/core/tx/program
ydb/core/protos
ydb/core/resource_pools
ydb/core/tx/columnshard/engines/scheme/versions
ydb/core/tx/columnshard/data_sharing/protos
ydb/core/tx/conveyor/usage
ydb/core/tx/program
)

GENERATE_ENUM_SERIALIZATION(read_metadata.h)
Expand Down
1 change: 1 addition & 0 deletions ydb/core/tx/conveyor_composite/usage/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,7 @@ TCPULimitsConfig::TCPULimitsConfig(const double cpuGroupThreadsLimit, const doub
TConclusionStatus TCPULimitsConfig::DeserializeFromProto(const NKikimrTxDataShard::TEvKqpScan& config) {
if (config.HasCpuGroupThreadsLimit()) {
CPUGroupThreadsLimit = config.GetCpuGroupThreadsLimit();
CPUGroupName = config.GetCpuGroupName();
}
return TConclusionStatus::Success();
}
Expand Down
1 change: 1 addition & 0 deletions ydb/core/tx/conveyor_composite/usage/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ class TConfig {
namespace NKikimr::NConveyorComposite {
class TCPULimitsConfig {
YDB_OPT(double, CPUGroupThreadsLimit);
YDB_OPT(TString, CPUGroupName);
YDB_READONLY(double, Weight, 1);

public:
Expand Down
Loading