Skip to content

Report correct status on overloaded errors in read table KIKIMR-17778 #946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snaury merged 1 commit into from
Jan 12, 2024
Merged

Report correct status on overloaded errors in read table KIKIMR-17778 #946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions ydb/core/grpc_services/rpc_read_table.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
#include "local_rate_limiter.h"
#include "service_table.h"

#include <ydb/library/yql/core/issue/yql_issue.h>
#include <ydb/library/yql/core/issue/protos/issue_id.pb.h>
#include <ydb/library/yql/public/issue/yql_issue_message.h>
#include <ydb/library/yql/public/issue/yql_issue.h>
#include <ydb/core/base/appdata.h>
Expand Down Expand Up @@ -246,6 +248,15 @@ class TReadTableRPC : public TActorBootstrapped<TReadTableRPC> {
NYql::IssueToMessage(issue, tmp);
return ReplyFinishStream(Ydb::StatusIds::SCHEME_ERROR, issueMessage, ctx);
}
case TEvTxUserProxy::TEvProposeTransactionStatus::EStatus::ProxyShardOverloaded: {
const auto req = TEvReadTableRequest::GetProtoRequest(Request_.get());

auto issue = NYql::YqlIssue({}, NYql::TIssuesIds::KIKIMR_OVERLOADED, TStringBuilder()
<< "Table " << req->path() << " is overloaded");
auto tmp = issueMessage.Add();
NYql::IssueToMessage(issue, tmp);
return ReplyFinishStream(Ydb::StatusIds::OVERLOADED, issueMessage, ctx);
}
case TEvTxUserProxy::TEvProposeTransactionStatus::EStatus::ProxyNotReady:
case TEvTxUserProxy::TEvProposeTransactionStatus::EStatus::ProxyShardTryLater:
case TEvTxUserProxy::TEvProposeTransactionStatus::EStatus::ProxyShardUnknown:
Expand Down
14 changes: 14 additions & 0 deletions ydb/core/tx/tx_proxy/read_table_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
#include <ydb/core/scheme/scheme_types_proto.h>
#include <ydb/core/engine/mkql_proto.h>

#include <ydb/library/yql/core/issue/yql_issue.h>
#include <ydb/library/yql/core/issue/protos/issue_id.pb.h>
#include <ydb/library/yql/public/issue/yql_issue_message.h>
#include <ydb/library/yql/public/issue/yql_issue_manager.h>

Expand Down Expand Up @@ -854,6 +856,16 @@ class TReadTableWorker : public TActorBootstrapped<TReadTableWorker> {
++TabletsToPrepare;
}

void RaiseShardOverloaded(const NKikimrTxDataShard::TEvProposeTransactionResult& record, ui64 shardId) {
auto issue = NYql::YqlIssue({}, NYql::TIssuesIds::KIKIMR_OVERLOADED, TStringBuilder()
<< "Shard " << shardId << " is overloaded");
for (const auto& err : record.GetError()) {
issue.AddSubIssue(new NYql::TIssue(TStringBuilder()
<< "[" << err.GetKind() << "] " << err.GetReason()));
}
IssueManager.RaiseIssue(std::move(issue));
}

void HandlePrepare(TEvDataShard::TEvProposeTransactionResult::TPtr& ev, const TActorContext& ctx) {
const auto* msg = ev->Get();
const auto& record = msg->Record;
Expand Down Expand Up @@ -974,6 +986,7 @@ class TReadTableWorker : public TActorBootstrapped<TReadTableWorker> {
TxProxyMon->TxResultShardOverloaded->Inc();
status = TEvTxUserProxy::TEvProposeTransactionStatus::EStatus::ProxyShardOverloaded;
code = NKikimrIssues::TStatusIds::OVERLOADED;
RaiseShardOverloaded(record, shardId);
break;
case NKikimrTxDataShard::TEvProposeTransactionResult::EXEC_ERROR:
TxProxyMon->TxResultExecError->Inc();
Expand Down Expand Up @@ -1940,6 +1953,7 @@ class TReadTableWorker : public TActorBootstrapped<TReadTableWorker> {

status = TEvTxUserProxy::TEvProposeTransactionStatus::EStatus::ProxyShardOverloaded;
code = NKikimrIssues::TStatusIds::OVERLOADED;
RaiseShardOverloaded(record, state.ShardId);
break;

case NKikimrTxDataShard::TEvProposeTransactionResult::EXEC_ERROR:
Expand Down