Added verbose setting

Author: GrigoriyPA

ydb/tests/tools/kqprun/kqprun.cpp

@@ -649,6 +649,11 @@ class TMain : public TMainClassArgs {
             {"each-query", TAsyncQueriesSettings::EVerbose::EachQuery},
             {"final", TAsyncQueriesSettings::EVerbose::Final}
         });
+
+        options.AddLongOption("verbose", "Common verbose level (max level 2)")
+            .RequiredArgument("uint")
+            .DefaultValue(1)
+            .StoreResult(&RunnerOptions.YdbSettings.VerboseLevel);
         options.AddLongOption("async-verbose", "Verbose type for async queries")
             .RequiredArgument("type")
             .DefaultValue("each-query")

ydb/tests/tools/kqprun/src/actors.cpp

@@ -299,6 +299,7 @@ class TSessionHolderActor : public NActors::TActorBootstrapped<TSessionHolderAct
     TSessionHolderActor(TCreateSessionRequest request, NThreading::TPromise<TString> openPromise, NThreading::TPromise<void> closePromise)
         : TargetNode_(request.TargetNode)
         , TraceId_(request.Event->Record.GetTraceId())
+        , VerboseLevel_(request.VerboseLevel)
         , Request_(std::move(request.Event))
         , OpenPromise_(openPromise)
         , ClosePromise_(closePromise)
@@ -317,7 +318,9 @@ class TSessionHolderActor : public NActors::TActorBootstrapped<TSessionHolderAct
         }
 
         SessionId_ = response.GetResponse().GetSessionId();
-        Cout << CoutColors_.Cyan() << "Created new session on node " << TargetNode_ << " with id " << SessionId_ << "\n";
+        if (VerboseLevel_ >= 1) {
+            Cout << CoutColors_.Cyan() << "Created new session on node " << TargetNode_ << " with id " << SessionId_ << "\n";
+        }
 
         PingSession();
     }
@@ -393,6 +396,7 @@ class TSessionHolderActor : public NActors::TActorBootstrapped<TSessionHolderAct
 private:
     const ui32 TargetNode_;
     const TString TraceId_;
+    const ui8 VerboseLevel_;
     const NColorizer::TColors CoutColors_ = NColorizer::AutoColors(Cout);
 
     std::unique_ptr<NKikimr::NKqp::TEvKqp::TEvCreateSessionRequest> Request_;

ydb/tests/tools/kqprun/src/actors.h

@@ -24,6 +24,7 @@ struct TQueryRequest {
 struct TCreateSessionRequest {
     std::unique_ptr<NKikimr::NKqp::TEvKqp::TEvCreateSessionRequest> Event;
     ui32 TargetNode;
+    ui8 VerboseLevel;
 };
 
 struct TEvPrivate {

ydb/tests/tools/kqprun/src/common.h

@@ -46,6 +46,7 @@ struct TYdbSetupSettings {
 
     bool TraceOptEnabled = false;
     TString LogOutputFile;
+    ui8 VerboseLevel = 1;
 
     TString YqlToken;
     TIntrusivePtr<NKikimr::NMiniKQL::IMutableFunctionRegistry> FunctionRegistry;

ydb/tests/tools/kqprun/src/kqp_runner.cpp

@@ -224,7 +224,7 @@ class TKqpRunner::TImpl {
         if (Options_.ResultOutput) {
             Cout << CoutColors_.Yellow() << TInstant::Now().ToIsoStringLocal() << " Writing script query results..." << CoutColors_.Default() << Endl;
             for (size_t i = 0; i < ResultSets_.size(); ++i) {
-                if (ResultSets_.size() > 1) {
+                if (ResultSets_.size() > 1 && Options_.YdbSettings.VerboseLevel >= 1) {
                     *Options_.ResultOutput << CoutColors_.Cyan() << "Result set " << i + 1 << ":" << CoutColors_.Default() << Endl;
                 }
                 PrintScriptResult(ResultSets_[i]);
@@ -306,14 +306,18 @@ class TKqpRunner::TImpl {
 
     void PrintSchemeQueryAst(const TString& ast) const {
         if (Options_.SchemeQueryAstOutput) {
-            Cout << CoutColors_.Cyan() << "Writing scheme query ast" << CoutColors_.Default() << Endl;
+            if (Options_.YdbSettings.VerboseLevel >= 1) {
+                Cout << CoutColors_.Cyan() << "Writing scheme query ast" << CoutColors_.Default() << Endl;
+            }
             Options_.SchemeQueryAstOutput->Write(ast);
         }
     }
 
     void PrintScriptAst(size_t queryId, const TString& ast) const {
         if (const auto output = GetValue<IOutputStream*>(queryId, Options_.ScriptQueryAstOutputs, nullptr)) {
-            Cout << CoutColors_.Cyan() << "Writing script query ast" << CoutColors_.Default() << Endl;
+            if (Options_.YdbSettings.VerboseLevel >= 1) {
+                Cout << CoutColors_.Cyan() << "Writing script query ast" << CoutColors_.Default() << Endl;
+            }
             output->Write(ast);
         }
     }
@@ -335,7 +339,9 @@ class TKqpRunner::TImpl {
 
     void PrintScriptPlan(size_t queryId, const TString& plan) const {
         if (const auto output = GetValue<IOutputStream*>(queryId, Options_.ScriptQueryPlanOutputs, nullptr)) {
-            Cout << CoutColors_.Cyan() << "Writing script query plan" << CoutColors_.Default() << Endl;
+            if (Options_.YdbSettings.VerboseLevel >= 1) {
+                Cout << CoutColors_.Cyan() << "Writing script query plan" << CoutColors_.Default() << Endl;
+            }
             PrintPlan(plan, output);
         }
     }
@@ -419,6 +425,9 @@ class TKqpRunner::TImpl {
     }
 
     void PrintScriptFinish(const TQueryMeta& meta, const TString& queryType) const {
+        if (Options_.YdbSettings.VerboseLevel < 1) {
+            return;
+        }
         Cout << CoutColors_.Cyan() << queryType << " request finished.";
         if (meta.TotalDuration) {
             Cout << " Total duration: " << meta.TotalDuration;

ydb/tests/tools/kqprun/src/ydb_setup.cpp

@@ -65,7 +65,7 @@ class TStaticSecuredCredentialsFactory : public NYql::ISecuredServiceAccountCred
 
 class TSessionState {
 public:
-    explicit TSessionState(NActors::TTestActorRuntime* runtime, ui32 targetNodeIndex, const TString& database, const TString& traceId)
+    explicit TSessionState(NActors::TTestActorRuntime* runtime, ui32 targetNodeIndex, const TString& database, const TString& traceId, ui8 verboseLevel)
         : Runtime_(runtime)
         , TargetNodeIndex_(targetNodeIndex)
     {
@@ -78,7 +78,8 @@ class TSessionState {
         auto closePromise = NThreading::NewPromise<void>();
         SessionHolderActor_ = Runtime_->Register(CreateSessionHolderActor(TCreateSessionRequest{
             .Event = std::move(event),
-            .TargetNode = Runtime_->GetNodeId(targetNodeIndex)
+            .TargetNode = Runtime_->GetNodeId(targetNodeIndex),
+            .VerboseLevel = verboseLevel
         }, openPromise, closePromise));
 
         SessionId_ = openPromise.GetFuture().GetValueSync();
@@ -210,7 +211,7 @@ class TYdbSetup::TImpl {
         serverSettings.SetYtGateway(Settings_.YtGateway);
         serverSettings.S3ActorsFactory = NYql::NDq::CreateS3ActorsFactory();
         serverSettings.SetInitializeFederatedQuerySetupFactory(true);
-        serverSettings.SetVerbose(false);
+        serverSettings.SetVerbose(Settings_.VerboseLevel >= 2);
 
         SetLoggerSettings(serverSettings);
         SetFunctionRegistry(serverSettings);
@@ -355,13 +356,13 @@ class TYdbSetup::TImpl {
         InitializeServer(grpcPort);
         WaitResourcesPublishing();
 
-        if (Settings_.MonitoringEnabled) {
+        if (Settings_.MonitoringEnabled && Settings_.VerboseLevel >= 1) {
             for (ui32 nodeIndex = 0; nodeIndex < Settings_.NodeCount; ++nodeIndex) {
                 Cout << CoutColors_.Cyan() << "Monitoring port" << (Settings_.NodeCount > 1 ? TStringBuilder() << " for node " << nodeIndex + 1 : TString()) << ": " << CoutColors_.Default() << Server_->GetRuntime()->GetMonPort(nodeIndex) << Endl;
             }
         }
 
-        if (Settings_.GrpcEnabled) {
+        if (Settings_.GrpcEnabled && Settings_.VerboseLevel >= 1) {
             Cout << CoutColors_.Cyan() << "Domain gRPC port: " << CoutColors_.Default() << grpcPort << Endl;
         }
     }
@@ -516,7 +517,7 @@ class TYdbSetup::TImpl {
 
         if (Settings_.SameSession) {
             if (!SessionState_) {
-                SessionState_ = TSessionState(GetRuntime(), targetNodeIndex, database, query.TraceId);
+                SessionState_ = TSessionState(GetRuntime(), targetNodeIndex, database, query.TraceId, Settings_.VerboseLevel);
             }
             request->SetSessionId(SessionState_->GetSessionId());
         }