diff options
| author | shumkovnd <shumkovnd@yandex-team.com> | 2023-01-26 15:22:50 +0300 |
|---|---|---|
| committer | shumkovnd <shumkovnd@yandex-team.com> | 2023-01-26 15:22:50 +0300 |
| commit | 750fb359789bdbc30a1680287c0241db8e8ef575 (patch) | |
| tree | d317d423b044bf6fb8df2e0b7f9ff290737b54a2 | |
| parent | 42c1023cad173ae9e7737355fedf76859d7e20c6 (diff) | |
| download | ydb-750fb359789bdbc30a1680287c0241db8e8ef575.tar.gz | |
add detailed msg at node limits exceeded
| -rw-r--r-- | ydb/core/kqp/executer_actor/kqp_executer_impl.h | 6 | ||||
| -rw-r--r-- | ydb/core/kqp/node_service/kqp_node_service.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ydb/core/kqp/executer_actor/kqp_executer_impl.h b/ydb/core/kqp/executer_actor/kqp_executer_impl.h index a9ae649d514..2b312831ab3 100644 --- a/ydb/core/kqp/executer_actor/kqp_executer_impl.h +++ b/ydb/core/kqp/executer_actor/kqp_executer_impl.h @@ -411,19 +411,19 @@ protected: switch (reason) { case NKikimrKqp::TEvStartKqpTasksResponse::NOT_ENOUGH_MEMORY: { ReplyErrorAndDie(Ydb::StatusIds::OVERLOADED, - YqlIssue({}, NYql::TIssuesIds::KIKIMR_OVERLOADED, "Not enough memory to execute query")); + YqlIssue({}, NYql::TIssuesIds::KIKIMR_OVERLOADED, message)); break; } case NKikimrKqp::TEvStartKqpTasksResponse::NOT_ENOUGH_EXECUTION_UNITS: { ReplyErrorAndDie(Ydb::StatusIds::OVERLOADED, - YqlIssue({}, NYql::TIssuesIds::KIKIMR_OVERLOADED, "Not enough computation units to execute query")); + YqlIssue({}, NYql::TIssuesIds::KIKIMR_OVERLOADED, message)); break; } case NKikimrKqp::TEvStartKqpTasksResponse::QUERY_MEMORY_LIMIT_EXCEEDED: { ReplyErrorAndDie(Ydb::StatusIds::PRECONDITION_FAILED, - YqlIssue({}, NYql::TIssuesIds::KIKIMR_PRECONDITION_FAILED, "Memory limit exceeded")); + YqlIssue({}, NYql::TIssuesIds::KIKIMR_PRECONDITION_FAILED, message)); break; } diff --git a/ydb/core/kqp/node_service/kqp_node_service.cpp b/ydb/core/kqp/node_service/kqp_node_service.cpp index e219a4c91fe..04b4083610b 100644 --- a/ydb/core/kqp/node_service/kqp_node_service.cpp +++ b/ydb/core/kqp/node_service/kqp_node_service.cpp @@ -198,21 +198,21 @@ private: TStringBuilder error; if (resourcesResponse.ExecutionUnits()) { - error << "TxId: " << txId << ", not enough compute actors, requested " << msg.GetTasks().size(); + error << "TxId: " << txId << ", NodeId: " << SelfId().NodeId() << ", not enough compute actors, requested " << msg.GetTasks().size(); LOG_N(error); failReason = NKikimrKqp::TEvStartKqpTasksResponse::NOT_ENOUGH_EXECUTION_UNITS; } if (resourcesResponse.ScanQueryMemory()) { - error << "TxId: " << txId << ", not enough memory, requested " << task.second.Memory; + error << "TxId: " << txId << ", NodeId: " << SelfId().NodeId() << ", not enough memory, requested " << task.second.Memory; LOG_N(error); failReason = NKikimrKqp::TEvStartKqpTasksResponse::NOT_ENOUGH_MEMORY; } if (resourcesResponse.QueryMemoryLimit()) { - error << "TxId: " << txId << ", memory limit exceeded, requested " << task.second.Memory; + error << "TxId: " << txId << ", NodeId: " << SelfId().NodeId() << ", memory limit exceeded, requested " << task.second.Memory; LOG_N(error); failReason = NKikimrKqp::TEvStartKqpTasksResponse::QUERY_MEMORY_LIMIT_EXCEEDED; |