diff options
author | Daniil Cherednik <dcherednik@ydb.tech> | 2023-09-26 17:10:50 +0000 |
---|---|---|
committer | Daniil Cherednik <dcherednik@ydb.tech> | 2023-09-26 17:10:50 +0000 |
commit | 052aa976d2efa2bf85bccddadd3390e2892ea3a9 (patch) | |
tree | 8e65537efc65588a0fa602c0369a78a7c629e4a3 /library | |
parent | 1aea989538126dcf9bb99aa87313ba942e679e7b (diff) | |
download | ydb-052aa976d2efa2bf85bccddadd3390e2892ea3a9.tar.gz |
Intermediate changes
x-stable-origin-commit: 0625cde2edaa58c9b3bc15294cc849f406362ef9
Diffstat (limited to 'library')
-rw-r--r-- | library/cpp/actors/core/executor_pool_io.cpp | 6 | ||||
-rw-r--r-- | library/cpp/actors/interconnect/interconnect_tcp_session.cpp | 2 | ||||
-rw-r--r-- | library/cpp/actors/interconnect/interconnect_tcp_session.h | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/library/cpp/actors/core/executor_pool_io.cpp b/library/cpp/actors/core/executor_pool_io.cpp index 80b927c486..adc5416fd8 100644 --- a/library/cpp/actors/core/executor_pool_io.cpp +++ b/library/cpp/actors/core/executor_pool_io.cpp @@ -134,7 +134,11 @@ namespace NActors { Threads[i].Thread->Join(); } - void TIOExecutorPool::GetCurrentStats(TExecutorPoolStats& /*poolStats*/, TVector<TExecutorThreadStats>& statsCopy) const { + void TIOExecutorPool::GetCurrentStats(TExecutorPoolStats& poolStats, TVector<TExecutorThreadStats>& statsCopy) const { + poolStats.CurrentThreadCount = PoolThreads; + poolStats.DefaultThreadCount = PoolThreads; + poolStats.MaxThreadCount = PoolThreads; + poolStats.PotentialMaxThreadCount = PoolThreads; statsCopy.resize(PoolThreads + 1); // Save counters from the pool object statsCopy[0] = TExecutorThreadStats(); diff --git a/library/cpp/actors/interconnect/interconnect_tcp_session.cpp b/library/cpp/actors/interconnect/interconnect_tcp_session.cpp index fd6793cb04..b58ca345a9 100644 --- a/library/cpp/actors/interconnect/interconnect_tcp_session.cpp +++ b/library/cpp/actors/interconnect/interconnect_tcp_session.cpp @@ -1043,7 +1043,7 @@ namespace NActors { } TDuration TInterconnectSessionTCP::GetCloseOnIdleTimeout() const { - return Coalesce(Proxy->Common->Settings.CloseOnIdle, DEFAULT_CLOSE_ON_IDLE_TIMEOUT); + return Proxy->Common->Settings.CloseOnIdle; } TDuration TInterconnectSessionTCP::GetLostConnectionTimeout() const { diff --git a/library/cpp/actors/interconnect/interconnect_tcp_session.h b/library/cpp/actors/interconnect/interconnect_tcp_session.h index e1c555e629..a499d189c2 100644 --- a/library/cpp/actors/interconnect/interconnect_tcp_session.h +++ b/library/cpp/actors/interconnect/interconnect_tcp_session.h @@ -82,7 +82,6 @@ namespace NActors { const ui64 UpperLimit; }; - static constexpr TDuration DEFAULT_CLOSE_ON_IDLE_TIMEOUT = TDuration::Seconds(90); static constexpr TDuration DEFAULT_DEADPEER_TIMEOUT = TDuration::Seconds(10); static constexpr TDuration DEFAULT_LOST_CONNECTION_TIMEOUT = TDuration::Seconds(10); static constexpr ui32 DEFAULT_MAX_INFLIGHT_DATA = 10240 * 1024; |