Refactor harmonizer, add tests and fix harmonizer logic (ydb-platform#9454)

Author: kruall

ydb/library/actors/core/executor_pool.h

@@ -15,13 +15,13 @@ namespace NActors {
     class ISchedulerCookie;
 
     struct TCpuConsumption {
-        double ConsumedUs = 0;
-        double BookedUs = 0;
+        double ElapsedUs = 0;
+        double CpuUs = 0;
         ui64 NotEnoughCpuExecutions = 0;
 
         void Add(const TCpuConsumption& other) {
-            ConsumedUs += other.ConsumedUs;
-            BookedUs += other.BookedUs;
+            ElapsedUs += other.ElapsedUs;
+            CpuUs += other.CpuUs;
             NotEnoughCpuExecutions += other.NotEnoughCpuExecutions;
         }
     };

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.MaxConsumedCpuUs = stats.MaxConsumedCpu;
-            poolStats.MinConsumedCpuUs = stats.MinConsumedCpu;
-            poolStats.MaxBookedCpuUs = stats.MaxBookedCpu;
-            poolStats.MinBookedCpuUs = stats.MinBookedCpu;
+            poolStats.MaxElapsedCpuUs = stats.MaxElapsedCpu;
+            poolStats.MinElapsedCpuUs = stats.MinElapsedCpu;
+            poolStats.MaxCpuUs = stats.MaxCpu;
+            poolStats.MinCpuUs = stats.MinCpu;
         }
 
         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.AvgConsumedCpu;
+            poolState.UsedCpu = stats.AvgElapsedCpu;
             poolState.PossibleMaxLimit = stats.PotentialMaxThreadCount;
         } else {
             poolState.PossibleMaxLimit = poolState.MaxLimit;

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 = PoolThreads;
+        poolStats.DefaultThreadCount = 0;
         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.AvgConsumedCpu;
+            poolState.UsedCpu = stats.AvgElapsedCpu;
         }
         poolState.CurrentLimit = PoolThreads;
         poolState.MaxLimit = PoolThreads;

ydb/library/actors/core/harmonizer.cpp

@@ -17,25 +17,29 @@ namespace NActors {
         ui64 DecreasingThreadsByStarvedState = 0;
         ui64 DecreasingThreadsByHoggishState = 0;
         ui64 DecreasingThreadsByExchange = 0;
-        float MaxConsumedCpu = 0.0;
-        float MinConsumedCpu = 0.0;
-        float AvgConsumedCpu = 0.0;
-        float MaxBookedCpu = 0.0;
-        float MinBookedCpu = 0.0;
+        float MaxElapsedCpu = 0.0;
+        float MinElapsedCpu = 0.0;
+        float AvgElapsedCpu = 0.0;
+        float MaxCpu = 0.0;
+        float MinCpu = 0.0;
         i16 PotentialMaxThreadCount = 0;
         bool IsNeedy = false;
         bool IsStarved = false;
         bool IsHoggish = false;
+    
+        TString ToString() const;
     };
 
     struct THarmonizerStats {
-        i64 MaxConsumedCpu = 0.0;
-        i64 MinConsumedCpu = 0.0;
-        i64 MaxBookedCpu = 0.0;
-        i64 MinBookedCpu = 0.0;
+        i64 MaxElapsedCpu = 0.0;
+        i64 MinElapsedCpu = 0.0;
+        i64 MaxCpu = 0.0;
+        i64 MinCpu = 0.0;
 
         double AvgAwakeningTimeUs = 0;
         double AvgWakingUpTimeUs = 0;
+
+        TString ToString() const;
     };
 
     // Pool cpu harmonizer

ydb/library/actors/core/harmonizer.h

@@ -63,10 +63,10 @@ namespace NActors {
         ui64 DecreasingThreadsByStarvedState = 0;
         ui64 DecreasingThreadsByHoggishState = 0;
         ui64 DecreasingThreadsByExchange = 0;
-        i64 MaxConsumedCpuUs = 0;
-        i64 MinConsumedCpuUs = 0;
-        i64 MaxBookedCpuUs = 0;
-        i64 MinBookedCpuUs = 0;
+        i64 MaxElapsedCpuUs = 0;
+        i64 MinElapsedCpuUs = 0;
+        i64 MaxCpuUs = 0;
+        i64 MinCpuUs = 0;
         double SpinningTimeUs = 0;
         double SpinThresholdUs = 0;
         i16 WrongWakenedThreadCount = 0;

ydb/library/actors/core/mon_stats.h

@@ -174,11 +174,11 @@
           NAMES("poolId", "pool", "threacCount", "minThreadCount", "maxThreadCount", "defaultThreadCount"))                           \
     PROBE(HarmonizeCheckPool, GROUPS("Harmonizer"),                                                                                   \
           TYPES(ui32, TString, double, double, double, double, ui32, ui32, bool, bool, bool),                                         \
-          NAMES("poolId", "pool", "booked", "consumed", "lastSecondBooked", "lastSecondConsumed", "threadCount", "maxThreadCount",    \
+          NAMES("poolId", "pool", "cpu", "elapsed", "lastSecondCpu", "lastSecondElapsed", "threadCount", "maxThreadCount",    \
                   "isStarved", "isNeedy", "isHoggish"))                                                                               \
     PROBE(HarmonizeCheckPoolByThread, GROUPS("Harmonizer"),                                                                           \
           TYPES(ui32, TString, i16, double, double, double, double),                                                                  \
-          NAMES("poolId", "pool", "threadIdx", "booked", "consumed", "lastSecondBooked", "lastSecondConsumed"))                       \
+          NAMES("poolId", "pool", "threadIdx", "cpu", "elapsed", "lastSecondCpu", "lastSecondElapsed"))                       \
     PROBE(WakingUpConsumption, GROUPS("Harmonizer"),                                                                                  \
           TYPES(double, double, double, double, double),                                                                              \
           NAMES("avgWakingUpUs", "realAvgWakingUpUs", "avgAwakeningUs", "realAvgAwakeningUs", "total"))                               \