Fixes

ydb-platform · Dec 18, 2024 · 78040a4 · 78040a4
1 parent 6d7e7a5
commit 78040a4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/ydb/core/grpc_services/rpc_stream_execute_scan_query.cpp b/ydb/core/grpc_services/rpc_stream_execute_scan_query.cpp
@@ -225,7 +225,8 @@ class TStreamExecuteScanQueryRPC : public TActorBootstrapped<TStreamExecuteScanQ
             &req->parameters(),
             req->collect_stats(),
             nullptr, // query_cache_policy
-            nullptr
+            nullptr,
+            NKqp::NPrivateEvents::TQueryRequestSettings().SetCollectFullDiagnostics(req->Getcollect_full_diagnostics())
         );
 
         ev->Record.MutableRequest()->SetCollectDiagnostics(req->Getcollect_full_diagnostics());

diff --git a/ydb/core/kqp/common/events/query.h b/ydb/core/kqp/common/events/query.h
@@ -288,7 +288,7 @@ struct TEvQueryRequest: public NActors::TEventLocal<TEvQueryRequest, TKqpEvents:
     }
 
     bool GetCollectDiagnostics() const {
-        return QuerySettings.CollectFullDiagnostics;
+        return RequestCtx ? QuerySettings.CollectFullDiagnostics : Record.MutableRequest()->GetCollectDiagnostics();
     }
 
     ui32 CalculateSerializedSize() const override {