Intermediate changes

1 files changed, 10 insertions, 6 deletions

diff --git a/yt/yt/core/concurrency/retrying_periodic_executor.cpp b/yt/yt/core/concurrency/retrying_periodic_executor.cpp
index 3ac46ea6d1..697a7939fb 100644
--- a/yt/yt/core/concurrency/retrying_periodic_executor.cpp
+++ b/yt/yt/core/concurrency/retrying_periodic_executor.cpp
@@ -25,6 +25,7 @@ TRetryingInvocationTimePolicy::TRetryingInvocationTimePolicy(
     , Backoff_(options)
 {
     CachedBackoffDuration_.store(options.MinBackoff, std::memory_order::relaxed);
+    CachedBackoffMultiplier_.store(options.BackoffJitter, std::memory_order::relaxed);
     CachedBackoffJitter_.store(options.BackoffJitter,std::memory_order::relaxed);
 }
 
@@ -69,18 +70,21 @@ void TRetryingInvocationTimePolicy::SetOptions(
     }
 
     if (backoffOptions) {
+        Backoff_.UpdateOptions(*backoffOptions);
+
+        if (!IsInBackoffMode()) {
+            Backoff_.Restart();
+        }
+
+        CachedBackoffDuration_.store(
+            Backoff_.GetBackoff(),
+            std::memory_order::relaxed);
         CachedBackoffMultiplier_.store(
             backoffOptions->BackoffMultiplier,
             std::memory_order::relaxed);
         CachedBackoffJitter_.store(
             backoffOptions->BackoffJitter,
             std::memory_order::relaxed);
-
-        if (!IsInBackoffMode()) {
-            Backoff_.Restart();
-        }
-
-        Backoff_.UpdateOptions(*backoffOptions);
     }
 }