Merge 87132af into be50511

Author: ssmike

ydb/core/kqp/executer_actor/kqp_planner.cpp

@@ -236,7 +236,10 @@ std::unique_ptr<TEvKqpNode::TEvStartKqpTasksRequest> TKqpPlanner::SerializeReque
     request.SetDatabase(Database);
     if (UserRequestContext->PoolConfig.has_value()) {
         request.SetMemoryPoolPercent(UserRequestContext->PoolConfig->QueryMemoryLimitPercentPerNode);
-        request.SetMaxCpuShare(UserRequestContext->PoolConfig->TotalCpuLimitPercentPerNode / 100.0);
+        request.SetPoolMaxCpuShare(UserRequestContext->PoolConfig->TotalCpuLimitPercentPerNode / 100.0);
+        if (UserRequestContext->PoolConfig->QueryCpuLimitPercentPerNode >= 0) {
+            request.SetQueryCpuShare(UserRequestContext->PoolConfig->QueryCpuLimitPercentPerNode / 100.0);
+        }
     }
 
     return result;

ydb/core/kqp/node_service/kqp_node_service.cpp

@@ -192,6 +192,10 @@ class TKqpNodeService : public TActorBootstrapped<TKqpNodeService> {
             ev->Get()->Record.GetSerializedGUCSettings() : "";
 
         auto schedulerNow = TlsActivationContext->Monotonic();
+        std::optional<ui64> querySchedulerGroup;
+        if (msg.HasQueryCpuShare()) {
+            querySchedulerGroup = Scheduler->MakeAnonymousGroup(schedulerNow, msg.GetQueryCpuShare());
+        }
 
         // start compute actors
         TMaybe<NYql::NDqProto::TRlPath> rlPath = Nothing();
@@ -219,7 +223,7 @@ class TKqpNodeService : public TActorBootstrapped<TKqpNodeService> {
             };
 
             if (SchedulerOptions.Scheduler->Disabled(group)) {
-                auto share = msg.GetMaxCpuShare();
+                auto share = msg.GetPoolMaxCpuShare();
                 if (share > 0) {
                     Scheduler->UpdateMaxShare(group, share, schedulerNow);
                     Send(SchedulerActorId, new TEvSchedulerNewPool(msg.GetDatabase(), group, share));
@@ -230,6 +234,9 @@ class TKqpNodeService : public TActorBootstrapped<TKqpNodeService> {
 
             if (!schedulingTaskOptions.NoThrottle) {
                 schedulingTaskOptions.Handle = SchedulerOptions.Scheduler->Enroll(schedulingTaskOptions.Group, schedulingTaskOptions.Weight, schedulingTaskOptions.Now);
+                if (querySchedulerGroup) {
+                    Scheduler->AddToGroup(schedulerNow, *querySchedulerGroup, schedulingTaskOptions.Handle);
+                }
             }
 
             auto result = CaFactory_->CreateKqpComputeActor({