Merge pull request #10090 from ydb-platform/mergelibs-241004-1110

Library import 241004-1110

3 files changed, 11 insertions, 17 deletions

diff --git a/yt/cpp/mapreduce/client/transaction_pinger.cpp b/yt/cpp/mapreduce/client/transaction_pinger.cpp
index 3b6ff2efc5..0a193352f7 100644
--- a/yt/cpp/mapreduce/client/transaction_pinger.cpp
+++ b/yt/cpp/mapreduce/client/transaction_pinger.cpp
@@ -292,21 +292,17 @@ private:
 
 ITransactionPingerPtr CreateTransactionPinger(const TConfigPtr& config)
 {
-    if (config->UseAsyncTxPinger) {
-        YT_LOG_DEBUG("Using async transaction pinger");
-        auto httpClientConfig = NYT::New<NHttp::TClientConfig>();
-        httpClientConfig->MaxIdleConnections = 16;
-        auto httpPoller = NConcurrency::CreateThreadPoolPoller(
-            config->AsyncHttpClientThreads,
-            "tx_http_client_poller");
-        auto httpClient = NHttp::CreateClient(std::move(httpClientConfig), std::move(httpPoller));
-
-        return MakeIntrusive<TSharedTransactionPinger>(
-            std::move(httpClient),
-            config->AsyncTxPingerPoolThreads);
-    } else {
-        return MakeIntrusive<TThreadPerTransactionPinger>();
-    }
+    YT_LOG_DEBUG("Using async transaction pinger");
+    auto httpClientConfig = NYT::New<NHttp::TClientConfig>();
+    httpClientConfig->MaxIdleConnections = 16;
+    auto httpPoller = NConcurrency::CreateThreadPoolPoller(
+        config->AsyncHttpClientThreads,
+        "tx_http_client_poller");
+    auto httpClient = NHttp::CreateClient(std::move(httpClientConfig), std::move(httpPoller));
+
+    return MakeIntrusive<TSharedTransactionPinger>(
+        std::move(httpClient),
+        config->AsyncTxPingerPoolThreads);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/yt/cpp/mapreduce/interface/config.cpp b/yt/cpp/mapreduce/interface/config.cpp
index 879bf79561..418868a7eb 100644
--- a/yt/cpp/mapreduce/interface/config.cpp
+++ b/yt/cpp/mapreduce/interface/config.cpp
@@ -200,7 +200,6 @@ void TConfig::Reset()
 
     GlobalTxId = GetEnv("YT_TRANSACTION", "");
 
-    UseAsyncTxPinger = true;
     AsyncHttpClientThreads = 1;
     AsyncTxPingerPoolThreads = 1;
 
diff --git a/yt/cpp/mapreduce/interface/config.h b/yt/cpp/mapreduce/interface/config.h
index a8baac8d4f..71f0c4fcdc 100644
--- a/yt/cpp/mapreduce/interface/config.h
+++ b/yt/cpp/mapreduce/interface/config.h
@@ -104,7 +104,6 @@ struct TConfig
     TDuration PingTimeout;
     TDuration PingInterval;
 
-    bool UseAsyncTxPinger;
     int AsyncHttpClientThreads;
     int AsyncTxPingerPoolThreads;