Fixed default retry time

GrigoriyPA · Feb 16, 2024 · 5431cd5 · 5431cd5
1 parent 043c044
commit 5431cd5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/ydb/core/fq/libs/compute/ydb/resources_cleaner_actor.cpp b/ydb/core/fq/libs/compute/ydb/resources_cleaner_actor.cpp
@@ -87,7 +87,7 @@ class TResourcesCleanerActor : public TBaseComputeActor<TResourcesCleanerActor>
 
     void Handle(const TEvYdbCompute::TEvForgetOperationResponse::TPtr& ev) {
         const auto& response = *ev.Get()->Get();
-        if (response.Status == NYdb::EStatus::TIMEOUT) {
+        if (response.Status == NYdb::EStatus::TIMEOUT || response.Status == NYdb::EStatus::CLIENT_DEADLINE_EXCEEDED) {
             SendForgetOperation(TDuration::MilliSeconds(BackoffTimer.NextBackoffMs()));
             return;
         }

diff --git a/ydb/library/query_actor/query_actor.h b/ydb/library/query_actor/query_actor.h
@@ -178,8 +178,9 @@ class TQueryRetryActor : public NActors::TActorBootstrapped<TQueryRetryActor<TQu
     explicit TQueryRetryActor(const NActors::TActorId& replyActorId, const TArgs&... args)
         : ReplyActorId(replyActorId)
         , RetryPolicy(IRetryPolicy::GetExponentialBackoffPolicy(
-            Retryable, TDuration::MilliSeconds(10),
-            TDuration::MilliSeconds(200), TDuration::Seconds(30), 5
+            Retryable, TDuration::MilliSeconds(10), 
+            TDuration::MilliSeconds(200), TDuration::Seconds(1),
+            std::numeric_limits<size_t>::max(), TDuration::Seconds(1)
         ))
         , CreateQueryActor([=]() {
             return new TQueryActor(args...);