YT-24579: Refactoring after review

don-dron · don-dron · commit 002792ef68e2 · 2025-04-21T20:06:16.000+03:00
commit_hash:438a7cfab48cb04907872a4cac2dca8332b012bb
diff --git a/yt/yt/core/bus/client.h b/yt/yt/core/bus/client.h
@@ -31,7 +31,7 @@ struct IBusClient
     virtual const NYTree::IAttributeDictionary& GetEndpointAttributes() const = 0;
 
     //! Apply new dynamic config.
-    virtual void OnDynamicConfigChanged(const NBus::TBusClientDynamicConfigPtr& config) = 0;
+    virtual void Reconfigure(const NBus::TBusClientDynamicConfigPtr& config) = 0;
 
     //! Creates a new bus.
     /*!
diff --git a/yt/yt/core/bus/tcp/client.cpp b/yt/yt/core/bus/tcp/client.cpp
@@ -160,7 +160,7 @@ class TTcpBusClient
         return *EndpointAttributes_;
     }
 
-    void OnDynamicConfigChanged(const NBus::TBusClientDynamicConfigPtr& config) override
+    void Reconfigure(const NBus::TBusClientDynamicConfigPtr& config) override
     {
         DynamicConfig_.Store(config);
     }
@@ -201,7 +201,7 @@ class TTcpBusClient
             std::move(poller),
             PacketTranscoderFactory_,
             MemoryUsageTracker_,
-            DynamicConfig_.Acquire()->NeedRejectConnectionDueMemoryOvercommit);
+            DynamicConfig_.Acquire()->NeedRejectConnectionOnMemoryOvercommit);
         connection->Start();
 
         return New<TTcpClientBusProxy>(std::move(connection));
diff --git a/yt/yt/core/bus/tcp/config.cpp b/yt/yt/core/bus/tcp/config.cpp
@@ -175,7 +175,7 @@ void TBusConfig::Register(TRegistrar registrar)
 
 void TBusDynamicConfig::Register(TRegistrar registrar)
 {
-    registrar.Parameter("need_reject_connection_due_memory_overcommit", &TThis::NeedRejectConnectionDueMemoryOvercommit)
+    registrar.Parameter("need_reject_connection_on_memory_overcommit", &TThis::NeedRejectConnectionOnMemoryOvercommit)
         .Default(false);
 }
 
diff --git a/yt/yt/core/bus/tcp/config.h b/yt/yt/core/bus/tcp/config.h
@@ -129,7 +129,7 @@ DEFINE_REFCOUNTED_TYPE(TBusConfig)
 struct TBusDynamicConfig
     : public NYTree::TYsonStruct
 {
-    bool NeedRejectConnectionDueMemoryOvercommit;
+    bool NeedRejectConnectionOnMemoryOvercommit;
 
     REGISTER_YSON_STRUCT(TBusDynamicConfig);
 
diff --git a/yt/yt/core/bus/tcp/connection.cpp b/yt/yt/core/bus/tcp/connection.cpp
@@ -115,7 +115,7 @@ TTcpConnection::TTcpConnection(
     IPollerPtr poller,
     IPacketTranscoderFactory* packetTranscoderFactory,
     IMemoryUsageTrackerPtr memoryUsageTracker,
-    bool needRejectConnectionDueMemoryOvercommit)
+    bool needRejectConnectionOnMemoryOvercommit)
     : Config_(std::move(config))
     , ConnectionType_(connectionType)
     , Id_(id)
@@ -140,7 +140,7 @@ TTcpConnection::TTcpConnection(
     , EncryptionMode_(Config_->EncryptionMode)
     , VerificationMode_(Config_->VerificationMode)
     , MemoryUsageTracker_(std::move(memoryUsageTracker))
-    , NeedRejectConnectionDueMemoryOvercommit_(needRejectConnectionDueMemoryOvercommit)
+    , NeedRejectConnectionOnMemoryOvercommit_(needRejectConnectionOnMemoryOvercommit)
 { }
 
 TTcpConnection::~TTcpConnection()
@@ -599,7 +599,7 @@ void TTcpConnection::InitBuffers()
             ? GetRefCountedTypeCookie<TTcpServerConnectionWriteBufferTag>()
             : GetRefCountedTypeCookie<TTcpClientConnectionWriteBufferTag>());
 
-    if (NeedRejectConnectionDueMemoryOvercommit_) {
+    if (NeedRejectConnectionOnMemoryOvercommit_) {
         trackedBlob
             .TryReserve(WriteBufferSize)
             .ThrowOnError();
diff --git a/yt/yt/core/bus/tcp/connection.h b/yt/yt/core/bus/tcp/connection.h
@@ -90,7 +90,7 @@ class TTcpConnection
         NConcurrency::IPollerPtr poller,
         IPacketTranscoderFactory* packetTranscoderFactory,
         IMemoryUsageTrackerPtr memoryUsageTracker,
-        bool needRejectConnectionDueMemoryOvercommit);
+        bool needRejectConnectionOnMemoryOvercommit);
 
     ~TTcpConnection();
 
@@ -281,7 +281,7 @@ class TTcpConnection
     const EVerificationMode VerificationMode_;
 
     const IMemoryUsageTrackerPtr MemoryUsageTracker_;
-    const bool NeedRejectConnectionDueMemoryOvercommit_;
+    const bool NeedRejectConnectionOnMemoryOvercommit_;
 
     NYTree::IAttributeDictionaryPtr PeerAttributes_;
 
diff --git a/yt/yt/core/bus/tcp/server.cpp b/yt/yt/core/bus/tcp/server.cpp
@@ -277,7 +277,7 @@ class TTcpBusServerBase
                 std::move(poller),
                 PacketTranscoderFactory_,
                 MemoryUsageTracker_,
-                DynamicConfig_.Acquire()->NeedRejectConnectionDueMemoryOvercommit);
+                DynamicConfig_.Acquire()->NeedRejectConnectionOnMemoryOvercommit);
 
             {
                 auto guard = WriterGuard(ConnectionsSpinLock_);
diff --git a/yt/yt/core/misc/fair_share_hierarchical_queue.h b/yt/yt/core/misc/fair_share_hierarchical_queue.h
@@ -47,7 +47,6 @@ struct IFairShareHierarchicalSlotQueueResource
     virtual void ReleaseResource() = 0;
 };
 
-DECLARE_REFCOUNTED_STRUCT(IFairShareHierarchicalSlotQueueResource)
 DEFINE_REFCOUNTED_TYPE(IFairShareHierarchicalSlotQueueResource)
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/yt/yt/core/misc/public.h b/yt/yt/core/misc/public.h
@@ -113,6 +113,7 @@ DECLARE_REFCOUNTED_STRUCT(TSingletonsConfig)
 DECLARE_REFCOUNTED_STRUCT(TSingletonsDynamicConfig)
 
 DECLARE_REFCOUNTED_STRUCT(TFairShareHierarchicalSchedulerDynamicConfig)
+DECLARE_REFCOUNTED_STRUCT(IFairShareHierarchicalSlotQueueResource)
 
 class TBloomFilterBuilder;
 class TBloomFilter;

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ class TTcpBusClient`
`160`	`160`	`return *EndpointAttributes_;`
`161`	`161`	`}`
`162`	`162`
`163`		`- void OnDynamicConfigChanged(const NBus::TBusClientDynamicConfigPtr& config) override`
	`163`	`+ void Reconfigure(const NBus::TBusClientDynamicConfigPtr& config) override`
`164`	`164`	`{`
`165`	`165`	`DynamicConfig_.Store(config);`
`166`	`166`	`}`
`@@ -201,7 +201,7 @@ class TTcpBusClient`
`201`	`201`	`std::move(poller),`
`202`	`202`	`PacketTranscoderFactory_,`
`203`	`203`	`MemoryUsageTracker_,`
`204`		`- DynamicConfig_.Acquire()->NeedRejectConnectionDueMemoryOvercommit);`
	`204`	`+ DynamicConfig_.Acquire()->NeedRejectConnectionOnMemoryOvercommit);`
`205`	`205`	`connection->Start();`
`206`	`206`
`207`	`207`	`return New<TTcpClientBusProxy>(std::move(connection));`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ void TBusConfig::Register(TRegistrar registrar)`
`175`	`175`
`176`	`176`	`void TBusDynamicConfig::Register(TRegistrar registrar)`
`177`	`177`	`{`
`178`		`- registrar.Parameter("need_reject_connection_due_memory_overcommit", &TThis::NeedRejectConnectionDueMemoryOvercommit)`
	`178`	`+ registrar.Parameter("need_reject_connection_on_memory_overcommit", &TThis::NeedRejectConnectionOnMemoryOvercommit)`
`179`	`179`	`.Default(false);`
`180`	`180`	`}`
`181`	`181`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ DEFINE_REFCOUNTED_TYPE(TBusConfig)`
`129`	`129`	`struct TBusDynamicConfig`
`130`	`130`	`: public NYTree::TYsonStruct`
`131`	`131`	`{`
`132`		`- bool NeedRejectConnectionDueMemoryOvercommit;`
	`132`	`+ bool NeedRejectConnectionOnMemoryOvercommit;`
`133`	`133`
`134`	`134`	`REGISTER_YSON_STRUCT(TBusDynamicConfig);`
`135`	`135`
Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@ class TTcpBusServerBase`
`277`	`277`	`std::move(poller),`
`278`	`278`	`PacketTranscoderFactory_,`
`279`	`279`	`MemoryUsageTracker_,`
`280`		`- DynamicConfig_.Acquire()->NeedRejectConnectionDueMemoryOvercommit);`
	`280`	`+ DynamicConfig_.Acquire()->NeedRejectConnectionOnMemoryOvercommit);`
`281`	`281`
`282`	`282`	`{`
`283`	`283`	`auto guard = WriterGuard(ConnectionsSpinLock_);`