Merge bdad7d5 into ba3d69d

Author: EgorkaZ

ydb/core/fq/libs/init/init.cpp

@@ -195,7 +195,7 @@ void Init(
 
     if (protoConfig.GetPrivateApi().GetEnabled()) {
         const auto& s3readConfig = protoConfig.GetReadActorsFactoryConfig().GetS3ReadActorFactoryConfig();
-        auto s3HttpRetryPolicy = NYql::GetHTTPDefaultRetryPolicy(TDuration::Max());
+        auto s3HttpRetryPolicy = NYql::GetHTTPDefaultRetryPolicy(NYql::THttpRetryPolicyOptions{.MaxTime = TDuration::Max(), .ExtendedRetriedCodes = {CURLE_GOT_NOTHING}});
         NYql::NDq::TS3ReadActorFactoryConfig readActorFactoryCfg;
         if (const ui64 rowsInBatch = s3readConfig.GetRowsInBatch()) {
             readActorFactoryCfg.RowsInBatch = rowsInBatch;

ydb/library/yql/providers/common/http_gateway/yql_http_default_retry_policy.cpp

@@ -2,11 +2,11 @@
 
 namespace NYql {
 
-IHTTPGateway::TRetryPolicy::TPtr GetHTTPDefaultRetryPolicy(TDuration maxTime, size_t maxRetries) {
-    if (!maxTime) {
-        maxTime = TDuration::Minutes(5);
+IHTTPGateway::TRetryPolicy::TPtr GetHTTPDefaultRetryPolicy(THttpRetryPolicyOptions&& options) {
+    if (!options.MaxTime) {
+        options.MaxTime = TDuration::Minutes(5);
     }
-    return IHTTPGateway::TRetryPolicy::GetExponentialBackoffPolicy([](CURLcode curlCode, long httpCode) {
+    return IHTTPGateway::TRetryPolicy::GetExponentialBackoffPolicy([options](CURLcode curlCode, long httpCode) {
 
         switch (curlCode) {
             case CURLE_OK:
@@ -25,8 +25,13 @@ IHTTPGateway::TRetryPolicy::TPtr GetHTTPDefaultRetryPolicy(TDuration maxTime, si
                 // retry small number of known errors
                 return ERetryErrorClass::ShortRetry;
             default:
-                // do not retry others
-                return ERetryErrorClass::NoRetry;
+                if (options.ExtendedRetriedCodes.contains(curlCode)) {
+                    // retry explicitly enumerated codes
+                    return ERetryErrorClass::ShortRetry;
+                } else {
+                    // do not retry others
+                    return ERetryErrorClass::NoRetry;
+                }
         }
 
         switch (httpCode) {
@@ -48,8 +53,12 @@ IHTTPGateway::TRetryPolicy::TPtr GetHTTPDefaultRetryPolicy(TDuration maxTime, si
     TDuration::MilliSeconds(10), // minDelay
     TDuration::MilliSeconds(200), // minLongRetryDelay
     TDuration::Seconds(30), // maxDelay
-    maxRetries, // maxRetries
-    maxTime); // maxTime
+    options.MaxRetries, // maxRetries
+    options.MaxTime); // maxTime
+}
+
+IHTTPGateway::TRetryPolicy::TPtr GetHTTPDefaultRetryPolicy(TDuration maxTime, size_t maxRetries) {
+    return GetHTTPDefaultRetryPolicy(THttpRetryPolicyOptions{.MaxTime = maxTime, .MaxRetries = maxRetries});
 }
 
 }

ydb/library/yql/providers/common/http_gateway/yql_http_default_retry_policy.h

@@ -4,6 +4,14 @@
 
 namespace NYql {
 
+struct THttpRetryPolicyOptions {
+    TDuration MaxTime = TDuration::Zero(); // Zero means default maxTime
+    size_t MaxRetries = std::numeric_limits<size_t>::max();
+    std::unordered_set<CURLcode> ExtendedRetriedCodes;
+};
+
+IHTTPGateway::TRetryPolicy::TPtr GetHTTPDefaultRetryPolicy(THttpRetryPolicyOptions&& options);
+
 IHTTPGateway::TRetryPolicy::TPtr GetHTTPDefaultRetryPolicy(TDuration maxTime = TDuration::Zero(), size_t maxRetries = std::numeric_limits<size_t>::max()); // Zero means default maxTime
 
 }