YT-20546: Supplying address in peer discovery interface

dcherednik · Nov 30, 2023 · 6239a18 · 6239a18
1 parent d0c6693
commit 6239a18
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/yt/yt/core/rpc/dynamic_channel_pool.cpp b/yt/yt/core/rpc/dynamic_channel_pool.cpp
@@ -308,6 +308,7 @@ class TDynamicChannelPool::TImpl
             auto channel = owner->ChannelFactory_->CreateChannel(address);
             auto request = owner->PeerDiscovery_->Discover(
                 channel,
+                address,
                 owner->Config_->DiscoverTimeout,
                 /*replyDelay*/ TDuration::Zero(),
                 owner->ServiceName_);
@@ -533,7 +534,12 @@ class TDynamicChannelPool::TImpl
 
             auto channel = owner->ChannelFactory_->CreateChannel(PeerAddress_);
             auto requestTimeout = peerPollingPeriod + owner->Config_->PeerPollingRequestTimeout;
-            auto req = owner->PeerDiscovery_->Discover(channel, requestTimeout, /*replyDelay*/ peerPollingPeriod, owner->ServiceName_);
+            auto req = owner->PeerDiscovery_->Discover(
+                channel,
+                PeerAddress_,
+                requestTimeout,
+                /*replyDelay*/ peerPollingPeriod,
+                owner->ServiceName_);
             YT_LOG_DEBUG("Polling peer (PollingPeriod: %v, RequestTimeout: %v)",
                 peerPollingPeriod,
                 requestTimeout);

diff --git a/yt/yt/core/rpc/peer_discovery.cpp b/yt/yt/core/rpc/peer_discovery.cpp
@@ -20,6 +20,7 @@ class TDefaultPeerDiscovery
 
     TFuture<TPeerDiscoveryResponse> Discover(
         IChannelPtr channel,
+        const TString& /*address*/,
         TDuration timeout,
         TDuration replyDelay,
         const std::string& serviceName) override

diff --git a/yt/yt/core/rpc/peer_discovery.h b/yt/yt/core/rpc/peer_discovery.h
@@ -17,6 +17,7 @@ struct IPeerDiscovery
 {
     virtual TFuture<TPeerDiscoveryResponse> Discover(
         IChannelPtr channel,
+        const TString& address,
         TDuration timeout,
         TDuration replyDelay,
         const std::string& serviceName) = 0;