diff options
| author | robot-piglet <robot-piglet@yandex-team.com> | 2024-02-12 17:15:09 +0300 |
|---|---|---|
| committer | robot-piglet <robot-piglet@yandex-team.com> | 2024-02-12 17:26:44 +0300 |
| commit | 3dc1292b97748d01bbf0d9dbdca55f2a2c205274 (patch) | |
| tree | b3ee95c40949a5d76a0974b589360a629f4297bb /yt/cpp | |
| parent | 200ee9c9b38ecc749e02b7d116e60057d42d7758 (diff) | |
| download | ydb-3dc1292b97748d01bbf0d9dbdca55f2a2c205274.tar.gz | |
Intermediate changes
Diffstat (limited to 'yt/cpp')
| -rw-r--r-- | yt/cpp/mapreduce/client/transaction.h | 2 | ||||
| -rw-r--r-- | yt/cpp/mapreduce/client/transaction_pinger.cpp | 28 | ||||
| -rw-r--r-- | yt/cpp/mapreduce/interface/config.cpp | 2 |
3 files changed, 10 insertions, 22 deletions
diff --git a/yt/cpp/mapreduce/client/transaction.h b/yt/cpp/mapreduce/client/transaction.h index 559fca619e..a363020b24 100644 --- a/yt/cpp/mapreduce/client/transaction.h +++ b/yt/cpp/mapreduce/client/transaction.h @@ -10,8 +10,6 @@ #include <util/generic/ptr.h> #include <util/system/thread.h> -#include <atomic> - namespace NYT { //////////////////////////////////////////////////////////////////////////////// diff --git a/yt/cpp/mapreduce/client/transaction_pinger.cpp b/yt/cpp/mapreduce/client/transaction_pinger.cpp index 2b51e47f9f..314fa2957b 100644 --- a/yt/cpp/mapreduce/client/transaction_pinger.cpp +++ b/yt/cpp/mapreduce/client/transaction_pinger.cpp @@ -14,16 +14,14 @@ #include <yt/cpp/mapreduce/raw_client/raw_requests.h> -#if defined(__x86_64__) || defined(__arm64__) - #include <yt/yt/core/concurrency/periodic_executor.h> - #include <yt/yt/core/concurrency/poller.h> - #include <yt/yt/core/concurrency/scheduler_api.h> - #include <yt/yt/core/concurrency/thread_pool_poller.h> - #include <yt/yt/core/concurrency/thread_pool.h> +#include <yt/yt/core/concurrency/periodic_executor.h> +#include <yt/yt/core/concurrency/poller.h> +#include <yt/yt/core/concurrency/scheduler_api.h> +#include <yt/yt/core/concurrency/thread_pool_poller.h> +#include <yt/yt/core/concurrency/thread_pool.h> - #include <yt/yt/core/http/client.h> - #include <yt/yt/core/http/http.h> -#endif // defined(__x86_64__) || defined(__arm64__) +#include <yt/yt/core/http/client.h> +#include <yt/yt/core/http/http.h> #include <library/cpp/yson/node/node_io.h> @@ -37,8 +35,6 @@ namespace NYT { //////////////////////////////////////////////////////////////////////////////// -#if defined(__x86_64__) || defined(__arm64__) - namespace { //////////////////////////////////////////////////////////////////////////////// @@ -203,8 +199,6 @@ private: NHttp::IClientPtr HttpClient_; }; -#endif // defined(__x86_64__) || defined(__arm64__) - //////////////////////////////////////////////////////////////////////////////// class TThreadPerTransactionPinger @@ -296,8 +290,6 @@ private: ITransactionPingerPtr CreateTransactionPinger(const TConfigPtr& config) { if (config->UseAsyncTxPinger) { -// TODO(aleexfi): Remove it after YT-17689 -#if defined(__x86_64__) || defined(__arm64__) YT_LOG_DEBUG("Using async transaction pinger"); auto httpClientConfig = NYT::New<NHttp::TClientConfig>(); httpClientConfig->MaxIdleConnections = 16; @@ -309,11 +301,9 @@ ITransactionPingerPtr CreateTransactionPinger(const TConfigPtr& config) return MakeIntrusive<TSharedTransactionPinger>( std::move(httpClient), config->AsyncTxPingerPoolThreads); -#else - YT_LOG_WARNING("Async transaction pinger is not supported on your platform. Fallback to TThreadPerTransactionPinger..."); -#endif // defined(__x86_64__) || defined(__arm64__) + } else { + return MakeIntrusive<TThreadPerTransactionPinger>(); } - return MakeIntrusive<TThreadPerTransactionPinger>(); } //////////////////////////////////////////////////////////////////////////////// diff --git a/yt/cpp/mapreduce/interface/config.cpp b/yt/cpp/mapreduce/interface/config.cpp index 407c213226..05161e145e 100644 --- a/yt/cpp/mapreduce/interface/config.cpp +++ b/yt/cpp/mapreduce/interface/config.cpp @@ -199,7 +199,7 @@ void TConfig::Reset() GlobalTxId = GetEnv("YT_TRANSACTION", ""); - UseAsyncTxPinger = false; + UseAsyncTxPinger = true; AsyncHttpClientThreads = 1; AsyncTxPingerPoolThreads = 1; |