Skip to content

Fix error status for Oltp Sink #15364

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
merged 2 commits into from
Mar 5, 2025
Merged

Fix error status for Oltp Sink #15364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f25aada
fix
nikvas0 Mar 5, 2025
fffd106
fix
nikvas0 Mar 5, 2025
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
10 changes: 10 additions & 0 deletions ydb/core/kqp/executer_actor/kqp_data_executer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ class TKqpDataExecuter : public TKqpExecuterBase<TKqpDataExecuter, EExecType::Da
try {
switch(ev->GetTypeRewrite()) {
hFunc(TEvKqp::TEvAbortExecution, HandleFinalize);
hFunc(TEvKqpBuffer::TEvError, Handle);
hFunc(TEvKqpBuffer::TEvResult, HandleFinalize);
hFunc(TEvents::TEvUndelivered, HandleFinalize);

Expand Down Expand Up @@ -405,6 +406,7 @@ class TKqpDataExecuter : public TKqpExecuterBase<TKqpDataExecuter, EExecType::Da
hFunc(TEvSaveScriptExternalEffectResponse, HandleResolve);
hFunc(TEvDescribeSecretsResponse, HandleResolve);
hFunc(TEvKqp::TEvAbortExecution, HandleAbortExecution);
hFunc(TEvKqpBuffer::TEvError, Handle);
default:
UnexpectedEvent("WaitResolveState", ev->GetTypeRewrite());
}
Expand Down Expand Up @@ -456,6 +458,7 @@ class TKqpDataExecuter : public TKqpExecuterBase<TKqpDataExecuter, EExecType::Da
hFunc(TEvKqpExecuter::TEvStreamDataAck, HandleStreamAck);
hFunc(TEvPipeCache::TEvDeliveryProblem, HandlePrepare);
hFunc(TEvKqp::TEvAbortExecution, HandlePrepare);
hFunc(TEvKqpBuffer::TEvError, Handle);
hFunc(TEvents::TEvUndelivered, HandleUndelivered);
hFunc(TEvInterconnect::TEvNodeDisconnected, HandleDisconnected);
hFunc(TEvKqpNode::TEvStartKqpTasksResponse, HandleStartKqpTasksResponse);
Expand Down Expand Up @@ -1136,6 +1139,7 @@ class TKqpDataExecuter : public TKqpExecuterBase<TKqpDataExecuter, EExecType::Da
hFunc(NYql::NDq::TEvDqCompute::TEvChannelData, HandleChannelData);
hFunc(TEvKqpExecuter::TEvStreamDataAck, HandleStreamAck);
hFunc(TEvKqp::TEvAbortExecution, HandleExecute);
hFunc(TEvKqpBuffer::TEvError, Handle);
IgnoreFunc(TEvInterconnect::TEvNodeConnected);
default:
UnexpectedEvent("ExecuteState", ev->GetTypeRewrite());
Expand Down Expand Up @@ -1192,6 +1196,11 @@ class TKqpDataExecuter : public TKqpExecuterBase<TKqpDataExecuter, EExecType::Da
}
}

void Handle(TEvKqpBuffer::TEvError::TPtr& ev) {
auto& msg = *ev->Get();
TBase::HandleAbortExecution(msg.StatusCode, msg.Issues, false);
}

void HandleExecute(TEvColumnShard::TEvProposeTransactionResult::TPtr& ev) {
TEvColumnShard::TEvProposeTransactionResult* res = ev->Get();
const ui64 shardId = res->Record.GetOrigin();
Expand Down Expand Up @@ -2295,6 +2304,7 @@ class TKqpDataExecuter : public TKqpExecuterBase<TKqpDataExecuter, EExecType::Da
switch (ev->GetTypeRewrite()) {
hFunc(NLongTxService::TEvLongTxService::TEvAcquireReadSnapshotResult, Handle);
hFunc(TEvKqp::TEvAbortExecution, HandleAbortExecution);
hFunc(TEvKqpBuffer::TEvError, Handle);
default:
UnexpectedEvent("WaitSnapshotState", ev->GetTypeRewrite());
}
Expand Down
23 changes: 15 additions & 8 deletions ydb/core/kqp/executer_actor/kqp_executer_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,15 +760,22 @@ class TKqpExecuterBase : public TActor<TDerived> {
void HandleAbortExecution(TEvKqp::TEvAbortExecution::TPtr& ev) {
auto& msg = ev->Get()->Record;
NYql::TIssues issues = ev->Get()->GetIssues();
LOG_D("Got EvAbortExecution, status: " << NYql::NDqProto::StatusIds_StatusCode_Name(msg.GetStatusCode())
HandleAbortExecution(msg.GetStatusCode(), ev->Get()->GetIssues(), ev->Sender != Target);
}

void HandleAbortExecution(
NYql::NDqProto::StatusIds::StatusCode statusCode,
const NYql::TIssues& issues,
const bool sessionSender) {
LOG_D("Got EvAbortExecution, status: " << NYql::NDqProto::StatusIds_StatusCode_Name(statusCode)
<< ", message: " << issues.ToOneLineString());
auto statusCode = NYql::NDq::DqStatusToYdbStatus(msg.GetStatusCode());
if (statusCode == Ydb::StatusIds::INTERNAL_ERROR) {
auto ydbStatusCode = NYql::NDq::DqStatusToYdbStatus(statusCode);
if (ydbStatusCode == Ydb::StatusIds::INTERNAL_ERROR) {
InternalError(issues);
} else if (statusCode == Ydb::StatusIds::TIMEOUT) {
TimeoutError(ev->Sender, issues);
} else if (ydbStatusCode == Ydb::StatusIds::TIMEOUT) {
TimeoutError(sessionSender, issues);
} else {
RuntimeError(NYql::NDq::DqStatusToYdbStatus(msg.GetStatusCode()), issues);
RuntimeError(NYql::NDq::DqStatusToYdbStatus(statusCode), issues);
}
}

Expand Down Expand Up @@ -1891,7 +1898,7 @@ class TKqpExecuterBase : public TActor<TDerived> {
ReplyErrorAndDie(status, &issues);
}

void TimeoutError(TActorId abortSender, NYql::TIssues issues) {
void TimeoutError(bool sessionSender, NYql::TIssues issues) {
if (AlreadyReplied) {
LOG_E("Timeout when we already replied - not good" << Endl << TBackTrace().PrintToString() << Endl);
return;
Expand All @@ -1915,7 +1922,7 @@ class TKqpExecuterBase : public TActor<TDerived> {
NYql::IssuesToMessage(issues, ResponseEv->Record.MutableResponse()->MutableIssues());

// TEvAbortExecution can come from either ComputeActor or SessionActor (== Target).
if (abortSender != Target) {
if (!sessionSender) {
auto abortEv = MakeHolder<TEvKqp::TEvAbortExecution>(status, issues);
this->Send(Target, abortEv.Release());
}
Expand Down
5 changes: 2 additions & 3 deletions ydb/core/kqp/session_actor/kqp_session_actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1745,7 +1745,7 @@ class TKqpSessionActor : public TActorBootstrapped<TKqpSessionActor> {
}

void Handle(TEvKqpBuffer::TEvError::TPtr& ev) {
const auto& msg = *ev->Get();
auto& msg = *ev->Get();

TString logMsg = TStringBuilder() << "got TEvKqpBuffer::TEvError in " << CurrentStateFuncName()
<< ", status: " << NYql::NDqProto::StatusIds_StatusCode_Name(msg.StatusCode) << " send to: " << ExecuterId << " from: " << ev->Sender;
Expand All @@ -1758,8 +1758,7 @@ class TKqpSessionActor : public TActorBootstrapped<TKqpSessionActor> {
}

if (ExecuterId) {
auto abortEv = MakeHolder<TEvKqp::TEvAbortExecution>(msg.StatusCode, msg.Issues);
Send(ExecuterId, abortEv.Release(), IEventHandle::FlagTrackDelivery);
Send(ExecuterId, new TEvKqpBuffer::TEvError{msg.StatusCode, std::move(msg.Issues)}, IEventHandle::FlagTrackDelivery);
} else {
ReplyQueryError(NYql::NDq::DqStatusToYdbStatus(msg.StatusCode), logMsg, MessageFromIssues(msg.Issues));
}
Expand Down
4 changes: 3 additions & 1 deletion ydb/services/ydb/ydb_common_ut.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,12 @@ class TBasicKikimrWithGrpcAndRootSchema {

//Server_->GetRuntime()->SetLogPriority(NKikimrServices::TX_PROXY_SCHEME_CACHE, NActors::NLog::PRI_DEBUG);
//Server_->GetRuntime()->SetLogPriority(NKikimrServices::SCHEME_BOARD_REPLICA, NActors::NLog::PRI_DEBUG);
Server_->GetRuntime()->SetLogPriority(NKikimrServices::FLAT_TX_SCHEMESHARD, NActors::NLog::PRI_INFO);
//Server_->GetRuntime()->SetLogPriority(NKikimrServices::FLAT_TX_SCHEMESHARD, NActors::NLog::PRI_INFO);
//Server_->GetRuntime()->SetLogPriority(NKikimrServices::TX_PROXY, NActors::NLog::PRI_DEBUG);
//Server_->GetRuntime()->SetLogPriority(NKikimrServices::TX_OLAPSHARD, NActors::NLog::PRI_DEBUG);
//Server_->GetRuntime()->SetLogPriority(NKikimrServices::TX_COLUMNSHARD, NActors::NLog::PRI_DEBUG);
//Server_->GetRuntime()->SetLogPriority(NKikimrServices::KQP_SESSION, NActors::NLog::PRI_DEBUG);
//Server_->GetRuntime()->SetLogPriority(NKikimrServices::KQP_EXECUTER, NActors::NLog::PRI_DEBUG);
if (enableYq) {
Server_->GetRuntime()->SetLogPriority(NKikimrServices::YQL_PROXY, NActors::NLog::PRI_DEBUG);
Server_->GetRuntime()->SetLogPriority(NKikimrServices::KQP_COMPUTE, NActors::NLog::PRI_DEBUG);
Expand Down
6 changes: 4 additions & 2 deletions ydb/services/ydb/ydb_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5703,8 +5703,10 @@ Y_UNIT_TEST_SUITE(TYqlDateTimeTests) {
#endif

Y_UNIT_TEST_SUITE(LocalityOperation) {
Y_UNIT_TEST(LocksFromAnotherTenants) {
TKikimrWithGrpcAndRootSchema server;
Y_UNIT_TEST_TWIN(LocksFromAnotherTenants, UseSink) {
NKikimrConfig::TAppConfig appConfig;
appConfig.MutableTableServiceConfig()->SetEnableOltpSink(UseSink);
TKikimrWithGrpcAndRootSchema server(appConfig);
//server.Server_->SetupLogging(

auto connection = NYdb::TDriver(
Expand Down
Loading