Revert "Merge to 24-3: fix harmonizer logic with hoggish pools (ydb-p…

…latform#9477)" This reverts commit ec98756.
kruall · Sep 20, 2024 · 901cd46 · 901cd46
1 parent 7eb941d
commit 901cd46
Show file tree

Hide file tree

Showing 11 changed files with 169 additions and 634 deletions.
diff --git a/ydb/library/actors/core/executor_pool.h b/ydb/library/actors/core/executor_pool.h
@@ -15,13 +15,13 @@ namespace NActors {
     class ISchedulerCookie;
 
     struct TCpuConsumption {
-        double ElapsedUs = 0;
-        double CpuUs = 0;
+        double ConsumedUs = 0;
+        double BookedUs = 0;
         ui64 NotEnoughCpuExecutions = 0;
 
         void Add(const TCpuConsumption& other) {
-            ElapsedUs += other.ElapsedUs;
-            CpuUs += other.CpuUs;
+            ConsumedUs += other.ConsumedUs;
+            BookedUs += other.BookedUs;
             NotEnoughCpuExecutions += other.NotEnoughCpuExecutions;
         }
     };

diff --git a/ydb/library/actors/core/executor_pool_basic.cpp b/ydb/library/actors/core/executor_pool_basic.cpp
@@ -408,10 +408,10 @@ namespace NActors {
             poolStats.DecreasingThreadsByHoggishState = stats.DecreasingThreadsByHoggishState;
             poolStats.DecreasingThreadsByExchange = stats.DecreasingThreadsByExchange;
             poolStats.PotentialMaxThreadCount = stats.PotentialMaxThreadCount;
-            poolStats.MaxElapsedCpuUs = stats.MaxElapsedCpu;
-            poolStats.MinElapsedCpuUs = stats.MinElapsedCpu;
-            poolStats.MaxCpuUs = stats.MaxCpu;
-            poolStats.MinCpuUs = stats.MinCpu;
+            poolStats.MaxConsumedCpuUs = stats.MaxConsumedCpu;
+            poolStats.MinConsumedCpuUs = stats.MinConsumedCpu;
+            poolStats.MaxBookedCpuUs = stats.MaxBookedCpu;
+            poolStats.MinBookedCpuUs = stats.MinBookedCpu;
         }
 
         statsCopy.resize(MaxFullThreadCount + 1);
@@ -430,7 +430,7 @@ namespace NActors {
     void TBasicExecutorPool::GetExecutorPoolState(TExecutorPoolState &poolState) const {
         if (Harmonizer) {
             TPoolHarmonizerStats stats = Harmonizer->GetPoolStats(PoolId);
-            poolState.UsedCpu = stats.AvgElapsedCpu;
+            poolState.UsedCpu = stats.AvgConsumedCpu;
             poolState.PossibleMaxLimit = stats.PotentialMaxThreadCount;
         } else {
             poolState.PossibleMaxLimit = poolState.MaxLimit;

diff --git a/ydb/library/actors/core/executor_pool_io.cpp b/ydb/library/actors/core/executor_pool_io.cpp
@@ -140,7 +140,7 @@ namespace NActors {
 
     void TIOExecutorPool::GetCurrentStats(TExecutorPoolStats& poolStats, TVector<TExecutorThreadStats>& statsCopy) const {
         poolStats.CurrentThreadCount = PoolThreads;
-        poolStats.DefaultThreadCount = 0;
+        poolStats.DefaultThreadCount = PoolThreads;
         poolStats.MaxThreadCount = PoolThreads;
         poolStats.PotentialMaxThreadCount = PoolThreads;
         statsCopy.resize(PoolThreads + 1);
@@ -156,7 +156,7 @@ namespace NActors {
     void TIOExecutorPool::GetExecutorPoolState(TExecutorPoolState &poolState) const {
         if (Harmonizer) {
             TPoolHarmonizerStats stats = Harmonizer->GetPoolStats(PoolId);
-            poolState.UsedCpu = stats.AvgElapsedCpu;
+            poolState.UsedCpu = stats.AvgConsumedCpu;
         }
         poolState.CurrentLimit = PoolThreads;
         poolState.MaxLimit = PoolThreads;

diff --git a/ydb/library/actors/core/executor_pool_shared.cpp b/ydb/library/actors/core/executor_pool_shared.cpp
@@ -143,16 +143,16 @@ void TSharedExecutorPool::GiveHalfThread(i16 from, i16 to) {
 }
 
 void TSharedExecutorPool::GetSharedStats(i16 poolId, std::vector<TExecutorThreadStats>& statsCopy) {
-    statsCopy.resize(SharedThreadCount);
+    statsCopy.resize(SharedThreadCount + 1);
     for (i16 i = 0; i < SharedThreadCount; ++i) {
-        Threads[i].Thread->GetSharedStats(poolId, statsCopy[i]);
+        Threads[i].Thread->GetSharedStats(poolId, statsCopy[i + 1]);
     }
 }
 
 void TSharedExecutorPool::GetSharedStatsForHarmonizer(i16 poolId, std::vector<TExecutorThreadStats>& statsCopy) {
-    statsCopy.resize(SharedThreadCount);
+    statsCopy.resize(SharedThreadCount + 1);
     for (i16 i = 0; i < SharedThreadCount; ++i) {
-        Threads[i].Thread->GetSharedStatsForHarmonizer(poolId, statsCopy[i]);
+        Threads[i].Thread->GetSharedStatsForHarmonizer(poolId, statsCopy[i + 1]);
     }
 }