intermediate changes

ref:f9eefd8eed3595f41a195fc7080bbf602b0075af

1 files changed, 35 insertions, 10 deletions

diff --git a/library/cpp/retry/retry.cpp b/library/cpp/retry/retry.cpp
index 92466cdeca5..f41c97e1794 100644
--- a/library/cpp/retry/retry.cpp
+++ b/library/cpp/retry/retry.cpp
@@ -2,19 +2,44 @@
 
 #include <util/stream/output.h>
 
-void DoWithRetry(std::function<void()> func, TRetryOptions retryOptions) {
-    DoWithRetry(func, retryOptions, true);
-}
+namespace {
+class TRetryOptionsWithRetCodePolicy : public IRetryPolicy<bool> {
+public:
+    explicit TRetryOptionsWithRetCodePolicy(const TRetryOptions& opts)
+        : Opts(opts)
+    {
+    }
 
-bool DoWithRetryOnRetCode(std::function<bool()> func, TRetryOptions retryOptions) {
-    for (ui32 attempt = 0; attempt <= retryOptions.RetryCount; ++attempt) {
-        if (func()) {
-            return true;
+    class TRetryState : public IRetryState {
+    public:
+        explicit TRetryState(const TRetryOptions& opts)
+            : Opts(opts)
+        {
+        }
+
+        TMaybe<TDuration> GetNextRetryDelay(bool ret) override {
+            if (ret || Attempt == Opts.RetryCount) {
+                return Nothing();
+            }
+            return Opts.GetTimeToSleep(Attempt++);
         }
-        auto sleep = retryOptions.SleepFunction;
-        sleep(retryOptions.GetTimeToSleep(attempt));
+
+    private:
+        const TRetryOptions Opts;
+        size_t Attempt = 0;
+    };
+
+    IRetryState::TPtr CreateRetryState() const override {
+        return std::make_unique<TRetryState>(Opts);
     }
-    return false;
+
+private:
+    const TRetryOptions Opts;
+};
+} // namespace
+
+bool DoWithRetryOnRetCode(std::function<bool()> func, TRetryOptions retryOptions) {
+    return DoWithRetryOnRetCode<bool>(std::move(func), std::make_shared<TRetryOptionsWithRetCodePolicy>(retryOptions), retryOptions.SleepFunction);
 }
 
 TRetryOptions MakeRetryOptions(const NRetry::TRetryOptionsPB& retryOptions) {