Revert actorsystem 24.3 to 24.2 for 24-3-7-hotfix (#8269)

Co-authored-by: Aleksandr Kriukov <kruall@ydb.tech>

Author: serbel324

ydb/core/base/pool_stats_collector.cpp

@@ -46,9 +46,9 @@ class TStatsCollectingActor : public NActors::TStatsCollectingActor {
     void OnWakeup(const TActorContext &ctx) override {
         MiniKQLPoolStats.Update();
 
-        TVector<std::tuple<TString, double, ui32, ui32>> pools;
+        TVector<std::tuple<TString, double, ui32>> pools;
         for (const auto& pool : PoolCounters) {
-            pools.emplace_back(pool.Name, pool.Usage, pool.Threads, pool.LimitThreads);
+            pools.emplace_back(pool.Name, pool.Usage, pool.Threads);
         }
 
         ctx.Send(NNodeWhiteboard::MakeNodeWhiteboardServiceId(ctx.SelfID.NodeId()), new NNodeWhiteboard::TEvWhiteboard::TEvSystemStateUpdate(pools));

ydb/core/kqp/workload_service/ut/common/kqp_workload_service_ut_common.cpp

@@ -307,8 +307,8 @@ class TWorkloadServiceYdbSetup : public IYdbSetup {
 
     // Cluster helpers
     void UpdateNodeCpuInfo(double usage, ui32 threads, ui64 nodeIndex = 0) override {
-        TVector<std::tuple<TString, double, ui32, ui32>> pools;
-        pools.emplace_back("User", usage, threads, threads);
+        TVector<std::tuple<TString, double, ui32>> pools;
+        pools.emplace_back("User", usage, threads);
 
         auto edgeActor = GetRuntime()->AllocateEdgeActor(nodeIndex);
         GetRuntime()->Send(

ydb/core/mind/hive/tx__update_tablet_metrics.cpp

@@ -54,7 +54,6 @@ class TTxUpdateTabletMetrics : public TTransactionBase<THive> {
         }
         TNodeInfo* node = Self->FindNode(nodeId);
         if (node != nullptr) {
-            node->UpdateResourceMaximum(record.GetResourceMaximum());
             node->UpdateResourceTotalUsage(record);
             node->Statistics.SetLastAliveTimestamp(now.MilliSeconds());
             node->ActualizeNodeStatistics(now);

ydb/core/mind/local.cpp

@@ -109,7 +109,6 @@ class TLocalNodeRegistrar : public TActorBootstrapped<TLocalNodeRegistrar> {
     ui64 UserPoolUsage = 0; // (usage uS x threads) / sec
     ui64 MemUsage = 0;
     ui64 MemLimit = 0;
-    ui64 CpuLimit = 0; // PotentialMaxThreadCount of UserPool
     double NodeUsage = 0;
 
     bool SentDrainNode = false;
@@ -273,28 +272,28 @@ class TLocalNodeRegistrar : public TActorBootstrapped<TLocalNodeRegistrar> {
         HandlePipeDestroyed(ctx);
     }
 
-    void FillResourceMaximum(NKikimrTabletBase::TMetrics* record) {
-        record->CopyFrom(ResourceLimit);
-        if (!record->HasCPU()) {
-            if (CpuLimit != 0) {
-                record->SetCPU(CpuLimit);
+    void SendStatusOk(const TActorContext &ctx) {
+        LOG_DEBUG_S(ctx, NKikimrServices::LOCAL, "TLocalNodeRegistrar SendStatusOk");
+        TAutoPtr<TEvLocal::TEvStatus> eventStatus = new TEvLocal::TEvStatus(TEvLocal::TEvStatus::StatusOk);
+        auto& record = eventStatus->Record;
+        record.SetStartTime(StartTime.GetValue());
+        record.MutableResourceMaximum()->CopyFrom(ResourceLimit);
+        if (!record.GetResourceMaximum().HasCPU()) {
+            TExecutorPoolStats poolStats;
+            TVector<TExecutorThreadStats> statsCopy;
+            TVector<TExecutorThreadStats> sharedStatsCopy;
+            ctx.ExecutorThread.ActorSystem->GetPoolStats(AppData()->UserPoolId, poolStats, statsCopy, sharedStatsCopy);
+            if (!statsCopy.empty()) {
+                record.MutableResourceMaximum()->SetCPU(poolStats.CurrentThreadCount * 1000000);
             }
         }
-        if (!record->HasMemory()) {
+        if (!record.GetResourceMaximum().HasMemory()) {
             if (MemLimit != 0) {
-                record->SetMemory(MemLimit);
+                record.MutableResourceMaximum()->SetMemory(MemLimit);
             } else {
-                record->SetMemory(NSystemInfo::TotalMemorySize());
+                record.MutableResourceMaximum()->SetMemory(NSystemInfo::TotalMemorySize());
             }
         }
-    }
-
-    void SendStatusOk(const TActorContext &ctx) {
-        LOG_DEBUG_S(ctx, NKikimrServices::LOCAL, "TLocalNodeRegistrar SendStatusOk");
-        TAutoPtr<TEvLocal::TEvStatus> eventStatus = new TEvLocal::TEvStatus(TEvLocal::TEvStatus::StatusOk);
-        auto& record = eventStatus->Record;
-        record.SetStartTime(StartTime.GetValue());
-        FillResourceMaximum(record.MutableResourceMaximum());
         NTabletPipe::SendData(ctx, HivePipeClient, eventStatus.Release());
     }
 
@@ -588,7 +587,6 @@ class TLocalNodeRegistrar : public TActorBootstrapped<TLocalNodeRegistrar> {
                 record.MutableTotalResourceUsage()->SetMemory(MemUsage);
             }
             record.SetTotalNodeUsage(NodeUsage);
-            FillResourceMaximum(record.MutableResourceMaximum());
             NTabletPipe::SendData(ctx, HivePipeClient, event.Release());
             SendTabletMetricsTime = ctx.Now();
         } else {
@@ -651,8 +649,7 @@ class TLocalNodeRegistrar : public TActorBootstrapped<TLocalNodeRegistrar> {
             const NKikimrWhiteboard::TSystemStateInfo& info = record.GetSystemStateInfo(0);
             if (static_cast<ui32>(info.PoolStatsSize()) > AppData()->UserPoolId) {
                 const auto& poolStats(info.GetPoolStats(AppData()->UserPoolId));
-                CpuLimit = poolStats.limit() * 1'000'000; // microseconds
-                UserPoolUsage = poolStats.usage() * CpuLimit; // microseconds
+                UserPoolUsage = poolStats.usage() * poolStats.threads() * 1000000; // uS
             }
 
             // Note: we use allocated memory because MemoryUsed(AnonRSS) has lag

ydb/core/node_whiteboard/node_whiteboard.h

@@ -361,13 +361,12 @@ struct TEvWhiteboard{
             }
         }
 
-        TEvSystemStateUpdate(const TVector<std::tuple<TString, double, ui32, ui32>>& poolStats) {
+        TEvSystemStateUpdate(const TVector<std::tuple<TString, double, ui32>>& poolStats) {
             for (const auto& row : poolStats) {
                 auto& pb = *Record.AddPoolStats();
                 pb.SetName(std::get<0>(row));
                 pb.SetUsage(std::get<1>(row));
                 pb.SetThreads(std::get<2>(row));
-                pb.SetLimit(std::get<3>(row));
             }
         }
 

ydb/core/protos/hive.proto

@@ -246,7 +246,6 @@ message TEvTabletMetrics {
     repeated TTabletMetrics TabletMetrics = 1;
     optional NKikimrTabletBase.TMetrics TotalResourceUsage = 2;
     optional double TotalNodeUsage = 3;
-    optional NKikimrTabletBase.TMetrics ResourceMaximum = 4;
 }
 
 message TEvReassignTablet {

ydb/core/protos/node_whiteboard.proto

@@ -277,7 +277,6 @@ message TSystemStateInfo {
         optional string Name = 1;
         optional double Usage = 2 [(InsignificantChangePercent) = 30];
         optional uint32 Threads = 3;
-        optional uint32 Limit = 4;
     }
 
     message TEndpoint {

ydb/library/actors/actor_type/common.h

@@ -29,17 +29,6 @@ enum class EInternalActorType {
     NAMESERVICE,
     DNS_RESOLVER,
     INTERCONNECT_PROXY_WRAPPER,
-    ACTOR_COROUTINE,
+    ACTOR_COROUTINE
 };
-
-enum class EInternalActorSystemActivity {
-    ACTOR_SYSTEM_SPIN,
-    ACTOR_SYSTEM_HARMONIZER,
-    ACTOR_SYSTEM_SEND,
-    ACTOR_SYSTEM_REGISTER,
-    ACTOR_SYSTEM_GET_ACTIVATION,
-    ACTOR_SYSTEM_GET_ACTIVATION_FROM_QUEUE,
-    ACTOR_SYSTEM_WAKE_UP,
-};
-
 }