Skip to content

Commit 0ece53f

Browse files
committed
use same on memory limit handler everywhere (#6641)
1 parent 557c3ad commit 0ece53f

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

ydb/core/kqp/compute_actor/kqp_pure_compute_actor.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,7 @@ STFUNC(TKqpComputeActor::StateFunc) {
133133
BaseStateFuncBody(ev);
134134
}
135135
} catch (const TMemoryLimitExceededException& e) {
136-
InternalError(TIssuesIds::KIKIMR_PRECONDITION_FAILED, TStringBuilder()
137-
<< "Mkql memory limit exceeded, limit: " << GetMkqlMemoryLimit()
138-
<< ", host: " << HostName()
139-
<< ", canAllocateExtraMemory: " << CanAllocateExtraMemory);
136+
TBase::OnMemoryLimitExceptionHandler();
140137
} catch (const NMiniKQL::TKqpEnsureFail& e) {
141138
InternalError((TIssuesIds::EIssueCode) e.GetCode(), e.GetMessage());
142139
} catch (const yexception& e) {

ydb/core/kqp/compute_actor/kqp_scan_compute_actor.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,7 @@ class TKqpScanComputeActor: public NYql::NDq::TDqSyncComputeActorBase<TKqpScanCo
4646
BaseStateFuncBody(ev);
4747
}
4848
} catch (const TMemoryLimitExceededException& e) {
49-
const TString sInfo = TStringBuilder() << "Mkql memory limit exceeded, limit: " << GetMkqlMemoryLimit()
50-
<< ", host: " << HostName() << ", canAllocateExtraMemory: " << CanAllocateExtraMemory;
51-
CA_LOG_E("ERROR:" + sInfo);
52-
InternalError(NYql::NDqProto::StatusIds::PRECONDITION_FAILED, NYql::TIssuesIds::KIKIMR_PRECONDITION_FAILED, sInfo);
49+
TBase::OnMemoryLimitExceptionHandler();
5350
} catch (const yexception& e) {
5451
InternalError(NYql::NDqProto::StatusIds::INTERNAL_ERROR, NYql::TIssuesIds::DEFAULT_ERROR, e.what());
5552
}

0 commit comments

Comments
 (0)