summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksandr Khoroshilov <[email protected]>2022-06-16 19:59:57 +0300
committerAleksandr Khoroshilov <[email protected]>2022-06-16 19:59:57 +0300
commit8cc06366642ee3cbe65f883eeda4b02941b3c748 (patch)
tree99014d80c98d4bb7cf2597b36f15ffbdabfbf63e
parent843969676a8e9afe446daa36b510299b7fb4a477 (diff)
Special settings for cluster overloaded case
ref:4f8609f1363ef1232022294874eba2874a839847
-rw-r--r--ydb/core/yq/libs/control_plane_storage/util.cpp8
-rw-r--r--ydb/library/yql/dq/actors/protos/dq_status_codes.proto1
-rw-r--r--ydb/library/yql/providers/dq/actors/executer_actor.cpp2
3 files changed, 10 insertions, 1 deletions
diff --git a/ydb/core/yq/libs/control_plane_storage/util.cpp b/ydb/core/yq/libs/control_plane_storage/util.cpp
index 2ed5c6ee5e4..e11bd641874 100644
--- a/ydb/core/yq/libs/control_plane_storage/util.cpp
+++ b/ydb/core/yq/libs/control_plane_storage/util.cpp
@@ -119,6 +119,14 @@ NConfig::TControlPlaneStorageConfig FillDefaultParameters(NConfig::TControlPlane
policy.SetRetryPeriod("1m");
policy.SetBackoffPeriod("1s");
}
+ {
+ auto& policyMapping = *config.AddRetryPolicyMapping();
+ policyMapping.AddStatusCode(NYql::NDqProto::StatusIds::CLUSTER_OVERLOADED);
+ auto& policy = *policyMapping.MutablePolicy();
+ policy.SetRetryCount(3);
+ policy.SetRetryPeriod("1d");
+ policy.SetBackoffPeriod("2s");
+ }
}
if (!config.GetStorage().GetToken() && config.GetStorage().GetOAuthFile()) {
diff --git a/ydb/library/yql/dq/actors/protos/dq_status_codes.proto b/ydb/library/yql/dq/actors/protos/dq_status_codes.proto
index db04330fcf2..fd7fb9e8682 100644
--- a/ydb/library/yql/dq/actors/protos/dq_status_codes.proto
+++ b/ydb/library/yql/dq/actors/protos/dq_status_codes.proto
@@ -18,5 +18,6 @@ message StatusIds {
LIMIT_EXCEEDED = 10;
UNSUPPORTED = 11;
EXTERNAL_ERROR = 12;
+ CLUSTER_OVERLOADED = 13;
}
}
diff --git a/ydb/library/yql/providers/dq/actors/executer_actor.cpp b/ydb/library/yql/providers/dq/actors/executer_actor.cpp
index 7232feeb228..7e911e9ba81 100644
--- a/ydb/library/yql/providers/dq/actors/executer_actor.cpp
+++ b/ydb/library/yql/providers/dq/actors/executer_actor.cpp
@@ -314,7 +314,7 @@ private:
<< ev->Get()->Record.GetError().GetMessage() << ":"
<< static_cast<int>(ev->Get()->Record.GetError().GetErrorCode());
Issues.AddIssue(TIssue(ev->Get()->Record.GetError().GetMessage()).SetCode(TIssuesIds::DQ_GATEWAY_NEED_FALLBACK_ERROR, TSeverityIds::S_ERROR));
- Finish(NYql::NDqProto::StatusIds::OVERLOADED, /*retriable = */ true, /*fallback = */ true);
+ Finish(NYql::NDqProto::StatusIds::CLUSTER_OVERLOADED, /*retriable = */ true, /*fallback = */ true);
return;
}
case TAllocateWorkersResponse::kNodes: