Revert commit rXXXXXX, Rename BackoffStrategy methods pt.2

4 files changed, 20 insertions, 20 deletions

diff --git a/yt/yt/client/api/config.cpp b/yt/yt/client/api/config.cpp
index b7be5e935d..d8cdabecd3 100644
--- a/yt/yt/client/api/config.cpp
+++ b/yt/yt/client/api/config.cpp
@@ -42,7 +42,7 @@ void TConnectionDynamicConfig::Register(TRegistrar registrar)
     registrar.Preprocessor([] (TThis* config) {
         // TODO(gritukan): Enable tablet retries by default one day.
         config->TabletWriteBackoff = New<TSerializableExponentialBackoffOptions>();
-        config->TabletWriteBackoff->InvocationCount = 1;
+        config->TabletWriteBackoff->RetryCount = 1;
     });
 }
 
diff --git a/yt/yt/core/misc/backoff_strategy.cpp b/yt/yt/core/misc/backoff_strategy.cpp
index c902ca5b5d..76a1a80c94 100644
--- a/yt/yt/core/misc/backoff_strategy.cpp
+++ b/yt/yt/core/misc/backoff_strategy.cpp
@@ -9,7 +9,7 @@ namespace NYT {
 TConstantBackoffOptions::operator TExponentialBackoffOptions() const
 {
     return TExponentialBackoffOptions{
-        .InvocationCount = InvocationCount,
+        .RetryCount = RetryCount,
         .MinBackoff = Backoff,
         .MaxBackoff = Backoff,
         .BackoffMultiplier = 1.0,
@@ -27,28 +27,28 @@ TBackoffStrategy::TBackoffStrategy(const TExponentialBackoffOptions& options)
 
 void TBackoffStrategy::Restart()
 {
-    InvocationIndex_ = 0;
+    RetryIndex_ = 0;
     Backoff_ = Options_.MinBackoff;
     ApplyJitter();
 }
 
 bool TBackoffStrategy::Next()
 {
-    if (InvocationIndex_ > 0) {
+    if (RetryIndex_ > 0) {
         Backoff_ = std::min(Backoff_ * Options_.BackoffMultiplier, Options_.MaxBackoff);
         ApplyJitter();
     }
-    return ++InvocationIndex_ < Options_.InvocationCount;
+    return ++RetryIndex_ < Options_.RetryCount;
 }
 
-int TBackoffStrategy::GetInvocationIndex() const
+int TBackoffStrategy::GetRetryIndex() const
 {
-    return InvocationIndex_;
+    return RetryIndex_;
 }
 
-int TBackoffStrategy::GetInvocationCount() const
+int TBackoffStrategy::GetRetryCount() const
 {
-    return Options_.InvocationCount;
+    return Options_.RetryCount;
 }
 
 TDuration TBackoffStrategy::GetBackoff() const
diff --git a/yt/yt/core/misc/backoff_strategy.h b/yt/yt/core/misc/backoff_strategy.h
index 82b3e8029c..4da3aebd44 100644
--- a/yt/yt/core/misc/backoff_strategy.h
+++ b/yt/yt/core/misc/backoff_strategy.h
@@ -8,13 +8,13 @@ namespace NYT {
 
 struct TExponentialBackoffOptions
 {
-    static constexpr int DefaultInvocationCount = 10;
+    static constexpr int DefaultRetryCount = 10;
     static constexpr auto DefaultMinBackoff = TDuration::Seconds(1);
     static constexpr auto DefaultMaxBackoff = TDuration::Seconds(5);
     static constexpr double DefaultBackoffMultiplier = 1.5;
     static constexpr double DefaultBackoffJitter = 0.1;
 
-    int InvocationCount = DefaultInvocationCount;
+    int RetryCount = DefaultRetryCount;
     TDuration MinBackoff = DefaultMinBackoff;
     TDuration MaxBackoff = DefaultMaxBackoff;
     double BackoffMultiplier = DefaultBackoffMultiplier;
@@ -25,11 +25,11 @@ struct TExponentialBackoffOptions
 
 struct TConstantBackoffOptions
 {
-    static constexpr int DefaultInvocationCount = 10;
+    static constexpr int DefaultRetryCount = 10;
     static constexpr auto DefaultBackoff = TDuration::Seconds(3);
     static constexpr double DefaultBackoffJitter = 0.1;
 
-    int InvocationCount = DefaultInvocationCount;
+    int RetryCount = DefaultRetryCount;
     TDuration Backoff = DefaultBackoff;
     double BackoffJitter = DefaultBackoffJitter;
 
@@ -47,8 +47,8 @@ public:
     void Restart();
     bool Next();
 
-    int GetInvocationIndex() const;
-    int GetInvocationCount() const;
+    int GetRetryIndex() const;
+    int GetRetryCount() const;
 
     TDuration GetBackoff() const;
 
@@ -57,7 +57,7 @@ public:
 private:
     TExponentialBackoffOptions Options_;
 
-    int InvocationIndex_;
+    int RetryIndex_;
     TDuration Backoff_;
     TDuration BackoffWithJitter_;
 
diff --git a/yt/yt/core/misc/backoff_strategy_config.cpp b/yt/yt/core/misc/backoff_strategy_config.cpp
index 2d5418b718..f4f0e69dd8 100644
--- a/yt/yt/core/misc/backoff_strategy_config.cpp
+++ b/yt/yt/core/misc/backoff_strategy_config.cpp
@@ -6,8 +6,8 @@ namespace NYT {
 
 void TSerializableExponentialBackoffOptions::Register(TRegistrar registrar)
 {
-    registrar.BaseClassParameter("invocation_count", &TThis::InvocationCount)
-        .Default(DefaultInvocationCount);
+    registrar.BaseClassParameter("retry_count", &TThis::RetryCount)
+        .Default(DefaultRetryCount);
     registrar.BaseClassParameter("min_backoff", &TThis::MinBackoff)
         .Default(DefaultMinBackoff);
     registrar.BaseClassParameter("max_backoff", &TThis::MaxBackoff)
@@ -22,8 +22,8 @@ void TSerializableExponentialBackoffOptions::Register(TRegistrar registrar)
 
 void TSerializableConstantBackoffOptions::Register(TRegistrar registrar)
 {
-    registrar.BaseClassParameter("retry_count", &TThis::InvocationCount)
-        .Default(DefaultInvocationCount);
+    registrar.BaseClassParameter("retry_count", &TThis::RetryCount)
+        .Default(DefaultRetryCount);
     registrar.BaseClassParameter("backoff", &TThis::Backoff)
         .Default(DefaultBackoff);
     registrar.BaseClassParameter("backoff_jitter", &TThis::BackoffJitter)