aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobot-piglet <robot-piglet@yandex-team.com>2024-02-07 18:01:48 +0300
committerAlexander Smirnov <alex@ydb.tech>2024-02-09 19:18:38 +0300
commitca1ffa51f782e2d0b75a8e461a3def832f80c3a5 (patch)
treec7f429e7621b1b50e84b19fab644c31fcfdb5468
parent9bcdb303d39601c363f30bf0f60c011dd2a8b698 (diff)
downloadydb-ca1ffa51f782e2d0b75a8e461a3def832f80c3a5.tar.gz
Intermediate changes
-rw-r--r--yt/yt/client/api/operation_client.cpp1
-rw-r--r--yt/yt/client/api/operation_client.h1
-rw-r--r--yt/yt/client/api/operations_archive_schema.cpp (renamed from yt/yt/client/api/operation_archive_schema.cpp)3
-rw-r--r--yt/yt/client/api/operations_archive_schema.h (renamed from yt/yt/client/api/operation_archive_schema.h)1
-rw-r--r--yt/yt/client/api/rpc_proxy/helpers.cpp9
-rw-r--r--yt/yt/client/ya.make2
-rw-r--r--yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto1
7 files changed, 16 insertions, 2 deletions
diff --git a/yt/yt/client/api/operation_client.cpp b/yt/yt/client/api/operation_client.cpp
index 350e3ebfc5..30aadc4078 100644
--- a/yt/yt/client/api/operation_client.cpp
+++ b/yt/yt/client/api/operation_client.cpp
@@ -196,6 +196,7 @@ void Serialize(const TJob& job, NYson::IYsonConsumer* consumer, TStringBuf idKey
.OptionalItem("stderr_size", job.StderrSize)
.OptionalItem("fail_context_size", job.FailContextSize)
.OptionalItem("error", job.Error)
+ .OptionalItem("interruption_info", job.InterruptionInfo)
.OptionalItem("abort_reason", TryGetJobAbortReasonFromError(job.Error))
.OptionalItem("brief_statistics", job.BriefStatistics)
.OptionalItem("input_paths", job.InputPaths)
diff --git a/yt/yt/client/api/operation_client.h b/yt/yt/client/api/operation_client.h
index 0d0ac82c0c..d330727320 100644
--- a/yt/yt/client/api/operation_client.h
+++ b/yt/yt/client/api/operation_client.h
@@ -317,6 +317,7 @@ struct TJob
NJobTrackerClient::TJobId JobCompetitionId;
NJobTrackerClient::TJobId ProbingJobCompetitionId;
NYson::TYsonString Error;
+ NYson::TYsonString InterruptionInfo;
NYson::TYsonString BriefStatistics;
NYson::TYsonString Statistics;
NYson::TYsonString InputPaths;
diff --git a/yt/yt/client/api/operation_archive_schema.cpp b/yt/yt/client/api/operations_archive_schema.cpp
index 86b3f6aa1d..bf0470bb47 100644
--- a/yt/yt/client/api/operation_archive_schema.cpp
+++ b/yt/yt/client/api/operations_archive_schema.cpp
@@ -1,4 +1,4 @@
-#include "operation_archive_schema.h"
+#include "operations_archive_schema.h"
namespace NYT::NApi {
@@ -101,6 +101,7 @@ TJobTableDescriptor::TIndex::TIndex(const TNameTablePtr& nameTable)
, UpdateTime(nameTable->RegisterName("update_time"))
, Address(nameTable->RegisterName("address"))
, Error(nameTable->RegisterName("error"))
+ , InterruptionInfo(nameTable->RegisterName("interruption_info"))
, Statistics(nameTable->RegisterName("statistics"))
, BriefStatistics(nameTable->RegisterName("brief_statistics"))
, StatisticsLz4(nameTable->RegisterName("statistics_lz4"))
diff --git a/yt/yt/client/api/operation_archive_schema.h b/yt/yt/client/api/operations_archive_schema.h
index ed5abd9ce3..b58864ed03 100644
--- a/yt/yt/client/api/operation_archive_schema.h
+++ b/yt/yt/client/api/operations_archive_schema.h
@@ -103,6 +103,7 @@ struct TJobTableDescriptor
const int UpdateTime;
const int Address;
const int Error;
+ const int InterruptionInfo;
const int Statistics;
const int BriefStatistics;
const int StatisticsLz4;
diff --git a/yt/yt/client/api/rpc_proxy/helpers.cpp b/yt/yt/client/api/rpc_proxy/helpers.cpp
index 68739781a6..45a5c48d6a 100644
--- a/yt/yt/client/api/rpc_proxy/helpers.cpp
+++ b/yt/yt/client/api/rpc_proxy/helpers.cpp
@@ -908,6 +908,10 @@ void ToProto(NProto::TJob* protoJob, const NApi::TJob& job)
if (job.Error) {
protoJob->set_error(job.Error.ToString());
}
+ if (job.InterruptionInfo) {
+ protoJob->set_interruption_info(job.InterruptionInfo.ToString());
+ }
+
if (job.BriefStatistics) {
protoJob->set_brief_statistics(job.BriefStatistics.ToString());
}
@@ -1016,6 +1020,11 @@ void FromProto(NApi::TJob* job, const NProto::TJob& protoJob)
} else {
job->Error = TYsonString();
}
+ if (protoJob.has_interruption_info()) {
+ job->InterruptionInfo = TYsonString(protoJob.interruption_info());
+ } else {
+ job->InterruptionInfo = TYsonString();
+ }
if (protoJob.has_brief_statistics()) {
job->BriefStatistics = TYsonString(protoJob.brief_statistics());
} else {
diff --git a/yt/yt/client/ya.make b/yt/yt/client/ya.make
index 6297f54087..2a3b885d36 100644
--- a/yt/yt/client/ya.make
+++ b/yt/yt/client/ya.make
@@ -21,7 +21,7 @@ SRCS(
api/query_tracker_client.cpp
api/helpers.cpp
api/internal_client.cpp
- api/operation_archive_schema.cpp
+ api/operations_archive_schema.cpp
api/public.cpp
api/rowset.cpp
api/skynet.cpp
diff --git a/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto b/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto
index 3782b5e9fb..649d7f6184 100644
--- a/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto
+++ b/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto
@@ -2910,6 +2910,7 @@ message TJob
optional uint64 fail_context_size = 9;
optional bool has_spec = 10;
optional bytes error = 11; // YSON
+ optional bytes interruption_info = 28; // YSON
optional bytes brief_statistics = 12; // YSON
optional bytes input_paths = 13; // YSON
optional bytes core_infos = 14; // YSON