diff options
| author | hcpp <hcpp@ydb.tech> | 2023-10-13 09:55:49 +0300 |
|---|---|---|
| committer | hcpp <hcpp@ydb.tech> | 2023-10-13 10:13:58 +0300 |
| commit | 097a68923196fe974f82e729e816c5b9f9bc2764 (patch) | |
| tree | 3d3db99e379b6741f82852ac4df1d8f41fa7d6e8 | |
| parent | fa8e6a8fa232ac2f201ffc012ed12db75bad6bce (diff) | |
| download | ydb-097a68923196fe974f82e729e816c5b9f9bc2764.tar.gz | |
TraceId = JobId + _ + RetryCount
| -rw-r--r-- | ydb/core/fq/libs/compute/ydb/events/events.h | 4 | ||||
| -rw-r--r-- | ydb/core/fq/libs/compute/ydb/executer_actor.cpp | 2 | ||||
| -rw-r--r-- | ydb/core/fq/libs/compute/ydb/ydb_connector_actor.cpp | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/ydb/core/fq/libs/compute/ydb/events/events.h b/ydb/core/fq/libs/compute/ydb/events/events.h index a2cf3cd8610..0b3a53ac8c8 100644 --- a/ydb/core/fq/libs/compute/ydb/events/events.h +++ b/ydb/core/fq/libs/compute/ydb/events/events.h @@ -52,13 +52,14 @@ struct TEvYdbCompute { // Events struct TEvExecuteScriptRequest : public NActors::TEventLocal<TEvExecuteScriptRequest, EvExecuteScriptRequest> { - TEvExecuteScriptRequest(TString sql, TString idempotencyKey, const TDuration& resultTtl, const TDuration& operationTimeout, Ydb::Query::Syntax syntax, Ydb::Query::ExecMode execMode) + TEvExecuteScriptRequest(TString sql, TString idempotencyKey, const TDuration& resultTtl, const TDuration& operationTimeout, Ydb::Query::Syntax syntax, Ydb::Query::ExecMode execMode, const TString& traceId) : Sql(std::move(sql)) , IdempotencyKey(std::move(idempotencyKey)) , ResultTtl(resultTtl) , OperationTimeout(operationTimeout) , Syntax(syntax) , ExecMode(execMode) + , TraceId(traceId) {} TString Sql; @@ -67,6 +68,7 @@ struct TEvYdbCompute { TDuration OperationTimeout; Ydb::Query::Syntax Syntax = Ydb::Query::SYNTAX_YQL_V1; Ydb::Query::ExecMode ExecMode = Ydb::Query::EXEC_MODE_EXECUTE; + TString TraceId; }; struct TEvExecuteScriptResponse : public NActors::TEventLocal<TEvExecuteScriptResponse, EvExecuteScriptResponse> { diff --git a/ydb/core/fq/libs/compute/ydb/executer_actor.cpp b/ydb/core/fq/libs/compute/ydb/executer_actor.cpp index 76c6ac79300..6d980c8cfe4 100644 --- a/ydb/core/fq/libs/compute/ydb/executer_actor.cpp +++ b/ydb/core/fq/libs/compute/ydb/executer_actor.cpp @@ -114,7 +114,7 @@ public: } void SendExecuteScript() { - Register(new TRetryActor<TEvYdbCompute::TEvExecuteScriptRequest, TEvYdbCompute::TEvExecuteScriptResponse, TString, TString, TDuration, TDuration, Ydb::Query::Syntax, Ydb::Query::ExecMode>(Counters.GetCounters(ERequestType::RT_EXECUTE_SCRIPT), SelfId(), Connector, Params.Sql, Params.JobId, Params.ResultTtl, Params.ExecutionTtl, GetSyntax(), GetExecuteMode())); + Register(new TRetryActor<TEvYdbCompute::TEvExecuteScriptRequest, TEvYdbCompute::TEvExecuteScriptResponse, TString, TString, TDuration, TDuration, Ydb::Query::Syntax, Ydb::Query::ExecMode, TString>(Counters.GetCounters(ERequestType::RT_EXECUTE_SCRIPT), SelfId(), Connector, Params.Sql, Params.JobId, Params.ResultTtl, Params.ExecutionTtl, GetSyntax(), GetExecuteMode(), Params.JobId + "_" + ToString(Params.RestartCount))); } Ydb::Query::Syntax GetSyntax() const { diff --git a/ydb/core/fq/libs/compute/ydb/ydb_connector_actor.cpp b/ydb/core/fq/libs/compute/ydb/ydb_connector_actor.cpp index 737a02f4a48..f1590e72389 100644 --- a/ydb/core/fq/libs/compute/ydb/ydb_connector_actor.cpp +++ b/ydb/core/fq/libs/compute/ydb/ydb_connector_actor.cpp @@ -50,6 +50,7 @@ public: settings.Syntax(event.Syntax); settings.ExecMode(event.ExecMode); settings.StatsMode(Ydb::Query::StatsMode::STATS_MODE_FULL); + settings.TraceId(event.TraceId); QueryClient ->ExecuteScript(event.Sql, settings) .Apply([actorSystem = NActors::TActivationContext::ActorSystem(), recipient = ev->Sender, cookie = ev->Cookie](auto future) { |