YT-23011: Fix regression introduced in rXXXXXX; re-enable RPC-over-HT…

…TP tests commit_hash:062b0d3f8ee24766c3894dc9502dc538515616eb
ytsaurus · Oct 15, 2024 · b533244 · b533244
1 parent a9f26da
commit b533244
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 12 deletions.
diff --git a/yt/yt/core/crypto/tls.cpp b/yt/yt/core/crypto/tls.cpp
@@ -340,10 +340,12 @@ class TTlsConnection
 
     bool IsIdle() const override
     {
-        return
-            Underlying_->IsIdle() &&
-            ActiveIOCount_ == 0 &&
-            !Failed_;
+        return ActiveIOCount_ == 0 && !Failed_;
+    }
+
+    bool IsReusable() const override
+    {
+        return IsIdle() && Underlying_->IsReusable();
     }
 
     TFuture<void> Abort() override

diff --git a/yt/yt/core/http/connection_reuse_helpers.cpp b/yt/yt/core/http/connection_reuse_helpers.cpp
@@ -17,7 +17,7 @@ TReusableConnectionState::TReusableConnectionState(
 
 TReusableConnectionState::~TReusableConnectionState()
 {
-    if (Reusable && OwningPool && Connection->IsIdle()) {
+    if (Reusable && OwningPool && Connection->IsReusable()) {
         OwningPool->Release(std::move(Connection));
     }
 }

diff --git a/yt/yt/core/http/unittests/http_ut.cpp b/yt/yt/core/http/unittests/http_ut.cpp
@@ -206,6 +206,11 @@ struct TFakeConnection
         return true;
     }
 
+    bool IsReusable() const override
+    {
+        return true;
+    }
+
     TFuture<void> Abort() override
     {
         THROW_ERROR_EXCEPTION("Not implemented");

diff --git a/yt/yt/core/net/connection.cpp b/yt/yt/core/net/connection.cpp
@@ -645,6 +645,11 @@ class TFDConnectionImpl
             !PeerDisconnectedList_.IsFired();
     }
 
+    bool IsReusable()
+    {
+        return IsIdle();
+    }
+
     TFuture<void> Abort(const TError& error)
     {
         YT_LOG_DEBUG(error, "Aborting connection");
@@ -1213,6 +1218,11 @@ class TFDConnection
         return Impl_->IsIdle();
     }
 
+    bool IsReusable() const override
+    {
+        return Impl_->IsReusable();
+    }
+
     TFuture<void> Abort() override
     {
         return Impl_->Abort(TError(EErrorCode::Aborted, "Connection aborted"));

diff --git a/yt/yt/core/net/connection.h b/yt/yt/core/net/connection.h
@@ -73,16 +73,19 @@ struct IConnection
     virtual const TNetworkAddress& GetLocalAddress() const = 0;
     virtual const TNetworkAddress& GetRemoteAddress() const = 0;
 
-    // Returns true if connection is not is failed state and has no
-    // active IO operations.
+    //! Returns true if connection is not is failed state and has no
+    //! active IO operations.
     virtual bool IsIdle() const = 0;
 
+    //! Returns true if connection can be reused by a pool.
+    virtual bool IsReusable() const = 0;
+
     virtual bool SetNoDelay() = 0;
     virtual bool SetKeepAlive() = 0;
 
     TFuture<void> Abort() override = 0;
 
-    // SubscribePeerDisconnect is best effort and is not guaranteed to fire.
+    //! This callback is best effort and is not guaranteed to fire.
     virtual void SubscribePeerDisconnect(TCallback<void()> callback) = 0;
 };
 

diff --git a/yt/yt/core/rpc/unittests/lib/common.h b/yt/yt/core/rpc/unittests/lib/common.h
@@ -523,10 +523,9 @@ using TAllTransports = ::testing::Types<
     TRpcOverGrpcImpl<false, false>,
     TRpcOverGrpcImpl<false, true>,
     TRpcOverGrpcImpl<true, false>,
-    TRpcOverGrpcImpl<true, true>
-    // XXX(babenko): temporarily off
-    // TRpcOverHttpImpl<false>,
-    // TRpcOverHttpImpl<true>
+    TRpcOverGrpcImpl<true, true>,
+    TRpcOverHttpImpl<false>,
+    TRpcOverHttpImpl<true>
 >;
 
 using TWithAttachments = ::testing::Types<