Add _cluster_name field to yql_statistics part of YT query progress (y…

…db-platform#2572)
dcherednik · Mar 11, 2024 · 2c454f8 · 2c454f8
1 parent 7f7dc0c
commit 2c454f8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/ydb/library/yql/providers/yt/gateway/native/yql_yt_exec_ctx.h b/ydb/library/yql/providers/yt/gateway/native/yql_yt_exec_ctx.h
@@ -126,7 +126,7 @@ class TExecContextBase: public TThrRefBase {
     static TString GetSpecImpl(const TVector<TTableType>& tables, size_t beginIdx, size_t endIdx, NYT::TNode initialOutSpec, bool ensureOldTypesOnly, ui64 nativeTypeCompatibilityFlags, bool intermediateInput);
 
     NThreading::TFuture<void> MakeOperationWaiter(const NYT::IOperationPtr& op, const TMaybe<ui32>& publicId) const {
-        return Session_->OpTracker_->MakeOperationWaiter(op, publicId, YtServer_, Session_->ProgressWriter_, Session_->StatWriter_);
+        return Session_->OpTracker_->MakeOperationWaiter(op, publicId, YtServer_, Cluster_, Session_->ProgressWriter_, Session_->StatWriter_);
     }
 
     TString GetAuth(const TYtSettings::TConstPtr& config) const;

diff --git a/ydb/library/yql/providers/yt/gateway/native/yql_yt_op_tracker.cpp b/ydb/library/yql/providers/yt/gateway/native/yql_yt_op_tracker.cpp
@@ -82,7 +82,7 @@ void TOperationTracker::Stop() {
 }
 
 TFuture<void> TOperationTracker::MakeOperationWaiter(const NYT::IOperationPtr& operation, TMaybe<ui32> publicId,
-    const TString& ytServer, const TOperationProgressWriter& progressWriter, const TStatWriter& statWriter)
+    const TString& ytServer, const TString& ytClusterName, const TOperationProgressWriter& progressWriter, const TStatWriter& statWriter)
 {
     auto future = operation->GetStartedFuture().Apply([operation](const auto& f) {
         f.GetValue();
@@ -147,7 +147,7 @@ TFuture<void> TOperationTracker::MakeOperationWaiter(const NYT::IOperationPtr& o
     }
 
     // Make a final progress write
-    return future.Apply([operation, progress, progressWriter, statWriter, ytServer] (const TFuture<void>& f) mutable {
+    return future.Apply([operation, progress, progressWriter, statWriter, ytServer, ytClusterName] (const TFuture<void>& f) mutable {
         f.GetValue();
         if (auto briefProgress = operation->GetBriefProgress()) {
             progress.Counters.ConstructInPlace();
@@ -177,6 +177,7 @@ TFuture<void> TOperationTracker::MakeOperationWaiter(const NYT::IOperationPtr& o
         }
 
         statEntries.emplace_back("_cluster", ytServer);
+        statEntries.emplace_back("_cluster_name", ytClusterName);
         statEntries.emplace_back("_id", GetGuidAsString(operation->GetId()));
         statWriter(progress.Id, statEntries);
         progressWriter(progress);

diff --git a/ydb/library/yql/providers/yt/gateway/native/yql_yt_op_tracker.h b/ydb/library/yql/providers/yt/gateway/native/yql_yt_op_tracker.h
@@ -30,7 +30,7 @@ class TOperationTracker: public TThrRefBase {
     void Stop();
 
     NThreading::TFuture<void> MakeOperationWaiter(const NYT::IOperationPtr& operation, TMaybe<ui32> publicId,
-        const TString& ytServer, const TOperationProgressWriter& writer, const TStatWriter& statWriter);
+        const TString& ytServer, const TString& ytClusterName, const TOperationProgressWriter& writer, const TStatWriter& statWriter);
 
 private:
     static void* Tracker(void* param);