|
@@ -498,10 +498,11 @@ private:
|
|
|
Counters->TxProxyMon->TxResultAborted->Inc();
|
|
|
LocksBroken = true;
|
|
|
|
|
|
- YQL_ENSURE(!res->Record.GetTxLocks().empty());
|
|
|
- ResponseEv->BrokenLockPathId = NYql::TKikimrPathId(
|
|
|
- res->Record.GetTxLocks(0).GetSchemeShard(),
|
|
|
- res->Record.GetTxLocks(0).GetPathId());
|
|
|
+ if (!res->Record.GetTxLocks().empty()) {
|
|
|
+ ResponseEv->BrokenLockPathId = NYql::TKikimrPathId(
|
|
|
+ res->Record.GetTxLocks(0).GetSchemeShard(),
|
|
|
+ res->Record.GetTxLocks(0).GetPathId());
|
|
|
+ }
|
|
|
ReplyErrorAndDie(Ydb::StatusIds::ABORTED, {});
|
|
|
}
|
|
|
default:
|
|
@@ -1193,11 +1194,14 @@ private:
|
|
|
shardState->State = TShardState::EState::Finished;
|
|
|
Counters->TxProxyMon->TxResultAborted->Inc();
|
|
|
LocksBroken = true;
|
|
|
- YQL_ENSURE(!res->Record.GetTxLocks().empty());
|
|
|
- ResponseEv->BrokenLockPathId = NYql::TKikimrPathId(
|
|
|
- res->Record.GetTxLocks(0).GetSchemeShard(),
|
|
|
- res->Record.GetTxLocks(0).GetPathId());
|
|
|
- ReplyErrorAndDie(Ydb::StatusIds::ABORTED, {});
|
|
|
+ if (!res->Record.GetTxLocks().empty()) {
|
|
|
+ ResponseEv->BrokenLockPathId = NYql::TKikimrPathId(
|
|
|
+ res->Record.GetTxLocks(0).GetSchemeShard(),
|
|
|
+ res->Record.GetTxLocks(0).GetPathId());
|
|
|
+ ReplyErrorAndDie(Ydb::StatusIds::ABORTED, {});
|
|
|
+ }
|
|
|
+ CheckExecutionComplete();
|
|
|
+ return;
|
|
|
}
|
|
|
default:
|
|
|
{
|