Intermediate changes

6 files changed, 20 insertions, 30 deletions

diff --git a/yt/yt/core/rpc/config.cpp b/yt/yt/core/rpc/config.cpp
index cd0d4a28a5..01e27c3649 100644
--- a/yt/yt/core/rpc/config.cpp
+++ b/yt/yt/core/rpc/config.cpp
@@ -98,8 +98,8 @@ void TMethodConfig::Register(TRegistrar registrar)
     registrar.Parameter("queue_size_limit", &TThis::QueueSizeLimit)
         .Alias("max_queue_size")
         .Optional();
-    registrar.Parameter("queue_bytes_size_limit", &TThis::QueueBytesSizeLimit)
-        .Alias("max_queue_bytes_size")
+    registrar.Parameter("queue_byte_size_limit", &TThis::QueueByteSizeLimit)
+        .Alias("max_queue_byte_size")
         .Optional();
     registrar.Parameter("concurrency_limit", &TThis::ConcurrencyLimit)
         .Alias("max_concurrency")
diff --git a/yt/yt/core/rpc/config.h b/yt/yt/core/rpc/config.h
index 26214ea5fc..8a5a14375d 100644
--- a/yt/yt/core/rpc/config.h
+++ b/yt/yt/core/rpc/config.h
@@ -152,7 +152,7 @@ class TMethodConfig
 public:
     std::optional<bool> Heavy;
     std::optional<int> QueueSizeLimit;
-    std::optional<i64> QueueBytesSizeLimit;
+    std::optional<i64> QueueByteSizeLimit;
     std::optional<int> ConcurrencyLimit;
     std::optional<NLogging::ELogLevel> LogLevel;
     std::optional<TDuration> LoggingSuppressionTimeout;
diff --git a/yt/yt/core/rpc/service_detail.cpp b/yt/yt/core/rpc/service_detail.cpp
index e8a47ab16a..e1da6db45b 100644
--- a/yt/yt/core/rpc/service_detail.cpp
+++ b/yt/yt/core/rpc/service_detail.cpp
@@ -166,10 +166,10 @@ auto TServiceBase::TMethodDescriptor::SetQueueSizeLimit(int value) const -> TMet
     return result;
 }
 
-auto TServiceBase::TMethodDescriptor::SetQueueBytesSizeLimit(i64 value) const -> TMethodDescriptor
+auto TServiceBase::TMethodDescriptor::SetQueueByteSizeLimit(i64 value) const -> TMethodDescriptor
 {
     auto result = *this;
-    result.QueueBytesSizeLimit = value;
+    result.QueueByteSizeLimit = value;
     return result;
 }
 
@@ -285,7 +285,7 @@ TServiceBase::TRuntimeMethodInfo::TRuntimeMethodInfo(
     , ResponseLoggingAnchor(NLogging::TLogManager::Get()->RegisterDynamicAnchor(
         Format("%v.%v ->", ServiceId.ServiceName, Descriptor.Method)))
     , RequestQueueSizeLimitErrorCounter(Profiler.Counter("/request_queue_size_errors"))
-    , RequestQueueBytesSizeLimitErrorCounter(Profiler.Counter("/request_queue_bytes_size_errors"))
+    , RequestQueueByteSizeLimitErrorCounter(Profiler.Counter("/request_queue_byte_size_errors"))
     , UnauthenticatedRequestsCounter(Profiler.Counter("/unauthenticated_requests"))
     , LoggingSuppressionFailedRequestThrottler(
         CreateReconfigurableThroughputThrottler(
@@ -1339,10 +1339,10 @@ bool TRequestQueue::IsQueueSizeLimitExceeded() const
         RuntimeInfo_->QueueSizeLimit.load(std::memory_order::relaxed);
 }
 
-bool TRequestQueue::IsQueueBytesSizeLimitExceeded() const
+bool TRequestQueue::IsQueueByteSizeLimitExceeded() const
 {
     return QueueBytesSize_.load(std::memory_order::relaxed) >=
-        RuntimeInfo_->QueueBytesSizeLimit.load(std::memory_order::relaxed);
+        RuntimeInfo_->QueueByteSizeLimit.load(std::memory_order::relaxed);
 }
 
 int TRequestQueue::GetQueueSize() const
@@ -1657,12 +1657,12 @@ void TServiceBase::HandleRequest(
         return;
     }
 
-    if (requestQueue->IsQueueBytesSizeLimitExceeded()) {
-        runtimeInfo->RequestQueueBytesSizeLimitErrorCounter.Increment();
+    if (requestQueue->IsQueueByteSizeLimitExceeded()) {
+        runtimeInfo->RequestQueueByteSizeLimitErrorCounter.Increment();
         replyError(TError(
             NRpc::EErrorCode::RequestQueueSizeLimitExceeded,
             "Request queue bytes size limit exceeded")
-            << TErrorAttribute("limit", runtimeInfo->QueueBytesSizeLimit.load())
+            << TErrorAttribute("limit", runtimeInfo->QueueByteSizeLimit.load())
             << TErrorAttribute("queue", requestQueue->GetName())
             << maybeThrottled);
         return;
@@ -2437,7 +2437,7 @@ TServiceBase::TRuntimeMethodInfoPtr TServiceBase::RegisterMethod(const TMethodDe
 
     runtimeInfo->Heavy.store(descriptor.Options.Heavy);
     runtimeInfo->QueueSizeLimit.store(descriptor.QueueSizeLimit);
-    runtimeInfo->QueueBytesSizeLimit.store(descriptor.QueueBytesSizeLimit);
+    runtimeInfo->QueueByteSizeLimit.store(descriptor.QueueByteSizeLimit);
     runtimeInfo->ConcurrencyLimit.Reconfigure(descriptor.ConcurrencyLimit);
     runtimeInfo->LogLevel.store(descriptor.LogLevel);
     runtimeInfo->LoggingSuppressionTimeout.store(descriptor.LoggingSuppressionTimeout);
@@ -2449,8 +2449,8 @@ TServiceBase::TRuntimeMethodInfoPtr TServiceBase::RegisterMethod(const TMethodDe
     profiler.AddFuncGauge("/request_queue_size_limit", MakeStrong(this), [=] {
         return runtimeInfo->QueueSizeLimit.load(std::memory_order::relaxed);
     });
-    profiler.AddFuncGauge("/request_queue_bytes_size_limit", MakeStrong(this), [=] {
-        return runtimeInfo->QueueBytesSizeLimit.load(std::memory_order::relaxed);
+    profiler.AddFuncGauge("/request_queue_byte_size_limit", MakeStrong(this), [=] {
+        return runtimeInfo->QueueByteSizeLimit.load(std::memory_order::relaxed);
     });
     profiler.AddFuncGauge("/concurrency_limit", MakeStrong(this), [=] {
         return runtimeInfo->ConcurrencyLimit.GetDynamicLimit();
@@ -2515,7 +2515,7 @@ void TServiceBase::DoConfigure(
 
             runtimeInfo->Heavy.store(methodConfig->Heavy.value_or(descriptor.Options.Heavy));
             runtimeInfo->QueueSizeLimit.store(methodConfig->QueueSizeLimit.value_or(descriptor.QueueSizeLimit));
-            runtimeInfo->QueueBytesSizeLimit.store(methodConfig->QueueBytesSizeLimit.value_or(descriptor.QueueBytesSizeLimit));
+            runtimeInfo->QueueByteSizeLimit.store(methodConfig->QueueByteSizeLimit.value_or(descriptor.QueueByteSizeLimit));
             runtimeInfo->ConcurrencyLimit.Reconfigure(methodConfig->ConcurrencyLimit.value_or(descriptor.ConcurrencyLimit));
             runtimeInfo->LogLevel.store(methodConfig->LogLevel.value_or(descriptor.LogLevel));
             runtimeInfo->LoggingSuppressionTimeout.store(methodConfig->LoggingSuppressionTimeout.value_or(descriptor.LoggingSuppressionTimeout));
diff --git a/yt/yt/core/rpc/service_detail.h b/yt/yt/core/rpc/service_detail.h
index c940dc09ad..754b371dae 100644
--- a/yt/yt/core/rpc/service_detail.h
+++ b/yt/yt/core/rpc/service_detail.h
@@ -561,7 +561,7 @@ protected:
         int QueueSizeLimit = 10'000;
 
         //! Maximum total size of requests in queue (both waiting and executing).
-        i64 QueueBytesSizeLimit = 2_GB;
+        i64 QueueByteSizeLimit = 2_GB;
 
         //! Maximum number of requests executing concurrently.
         int ConcurrencyLimit = 10'000;
@@ -603,7 +603,7 @@ protected:
         TMethodDescriptor SetHeavy(bool value) const;
         TMethodDescriptor SetResponseCodec(NCompression::ECodec value) const;
         TMethodDescriptor SetQueueSizeLimit(int value) const;
-        TMethodDescriptor SetQueueBytesSizeLimit(i64 value) const;
+        TMethodDescriptor SetQueueByteSizeLimit(i64 value) const;
         TMethodDescriptor SetConcurrencyLimit(int value) const;
         TMethodDescriptor SetSystem(bool value) const;
         TMethodDescriptor SetLogLevel(NLogging::ELogLevel value) const;
@@ -708,13 +708,13 @@ protected:
         std::atomic<bool> Pooled = true;
 
         std::atomic<int> QueueSizeLimit = 0;
-        std::atomic<i64> QueueBytesSizeLimit = 0;
+        std::atomic<i64> QueueByteSizeLimit = 0;
 
         TDynamicConcurrencyLimit ConcurrencyLimit;
         std::atomic<double> WaitingTimeoutFraction = 0;
 
         NProfiling::TCounter RequestQueueSizeLimitErrorCounter;
-        NProfiling::TCounter RequestQueueBytesSizeLimitErrorCounter;
+        NProfiling::TCounter RequestQueueByteSizeLimitErrorCounter;
         NProfiling::TCounter UnauthenticatedRequestsCounter;
 
         std::atomic<NLogging::ELogLevel> LogLevel = {};
@@ -1032,7 +1032,7 @@ public:
     void Configure(const TMethodConfigPtr& config);
 
     bool IsQueueSizeLimitExceeded() const;
-    bool IsQueueBytesSizeLimitExceeded() const;
+    bool IsQueueByteSizeLimitExceeded() const;
 
     int GetQueueSize() const;
     int GetConcurrency() const;
diff --git a/yt/yt/library/profiling/sensor.cpp b/yt/yt/library/profiling/sensor.cpp
index d4299ac8af..0e37acf218 100644
--- a/yt/yt/library/profiling/sensor.cpp
+++ b/yt/yt/library/profiling/sensor.cpp
@@ -225,15 +225,6 @@ void TRateHistogram::Add(double value, int count) const noexcept
     Histogram_->Add(value, count);
 }
 
-void TRateHistogram::Remove(double value, int count) const noexcept
-{
-    if (!Histogram_) {
-        return;
-    }
-
-    Histogram_->Remove(value, count);
-}
-
 TRateHistogram::operator bool() const
 {
     return Histogram_.operator bool();
diff --git a/yt/yt/library/profiling/sensor.h b/yt/yt/library/profiling/sensor.h
index b1d5662298..3d81605ed1 100644
--- a/yt/yt/library/profiling/sensor.h
+++ b/yt/yt/library/profiling/sensor.h
@@ -161,7 +161,6 @@ class TRateHistogram
 {
 public:
     void Add(double value, int count = 1) const noexcept;
-    void Remove(double value, int count = 1) const noexcept;
 
     explicit operator bool() const;