diff options
author | kruall <kruall@ydb.tech> | 2023-03-14 21:13:26 +0300 |
---|---|---|
committer | kruall <kruall@ydb.tech> | 2023-03-14 21:13:26 +0300 |
commit | dcc825195faf2ab5cf9aa92d0ff1ae616a5d8a6e (patch) | |
tree | f82739f796e37e5c3e691efbf975452499b473c5 | |
parent | b8e6cf3ea513ef24dadcfab960f0f0adc1ff4caf (diff) | |
download | ydb-dcc825195faf2ab5cf9aa92d0ff1ae616a5d8a6e.tar.gz |
Fix cpu count metric,
-rw-r--r-- | library/cpp/actors/core/actorsystem.h | 2 | ||||
-rw-r--r-- | library/cpp/actors/core/config.h | 2 | ||||
-rw-r--r-- | ydb/core/mind/local.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/library/cpp/actors/core/actorsystem.h b/library/cpp/actors/core/actorsystem.h index b506a1e3601..0bc788f9be9 100644 --- a/library/cpp/actors/core/actorsystem.h +++ b/library/cpp/actors/core/actorsystem.h @@ -130,7 +130,7 @@ namespace NActors { std::optional<ui32> GetThreadsOptional(const ui32 poolId) const { if (Y_LIKELY(Executors)) { if (Y_LIKELY(poolId < ExecutorsCount)) { - return Executors[poolId]->GetThreads(); + return Executors[poolId]->GetDefaultThreadCount(); } else { return {}; } diff --git a/library/cpp/actors/core/config.h b/library/cpp/actors/core/config.h index 30a5050197f..650b1f39f5b 100644 --- a/library/cpp/actors/core/config.h +++ b/library/cpp/actors/core/config.h @@ -131,7 +131,7 @@ namespace NActors { std::optional<ui32> GetThreadsOptional(ui32 poolId) const { for (const auto& p : Basic) { if (p.PoolId == poolId) { - return p.Threads; + return p.DefaultThreadCount; } } for (const auto& p : IO) { diff --git a/ydb/core/mind/local.cpp b/ydb/core/mind/local.cpp index 6f53e42b433..854045bd600 100644 --- a/ydb/core/mind/local.cpp +++ b/ydb/core/mind/local.cpp @@ -280,7 +280,7 @@ class TLocalNodeRegistrar : public TActorBootstrapped<TLocalNodeRegistrar> { TVector<TExecutorThreadStats> statsCopy; ctx.ExecutorThread.ActorSystem->GetPoolStats(AppData()->UserPoolId, poolStats, statsCopy); if (!statsCopy.empty()) { - record.MutableResourceMaximum()->SetCPU((statsCopy.size() - 1) * 1000000); + record.MutableResourceMaximum()->SetCPU(poolStats.CurrentThreadCount * 1000000); } } if (!record.GetResourceMaximum().HasMemory()) { |