Merge 591c89d into b3c26e4

Author: GrigoriyPA

ydb/tests/tools/kqprun/kqprun.cpp

@@ -94,6 +94,19 @@ void RunScript(const TExecutionOptions& executionOptions, const NKqpRun::TRunner
         }
     }
 
+    if (runnerOptions.YdbSettings.MonitoringEnabled) {
+        Cout << colors.Yellow() << TInstant::Now().ToIsoStringLocal() << " Started reading commands" << colors.Default() << Endl;
+        while (true) {
+            TString command;
+            Cin >> command;
+
+            if (command == "exit") {
+                break;
+            }
+            Cerr << colors.Red() << TInstant::Now().ToIsoStringLocal() << " Invalid command '" << command << "'" << colors.Default() << Endl;
+        }
+    }
+
     Cout << colors.Yellow() << TInstant::Now().ToIsoStringLocal() << " Finalization of kqp runner..." << colors.Default() << Endl;
 }
 
@@ -269,6 +282,11 @@ void RunMain(int argc, const char* argv[]) {
         .RequiredArgument("INT")
         .DefaultValue(runnerOptions.YdbSettings.NodeCount)
         .StoreResult(&runnerOptions.YdbSettings.NodeCount);
+    options.AddLongOption('M', "monitoring", "Enable embedded UI access and run kqprun as deamon")
+        .Optional()
+        .NoArgument()
+        .DefaultValue(runnerOptions.YdbSettings.MonitoringEnabled)
+        .SetFlag(&runnerOptions.YdbSettings.MonitoringEnabled);
 
     options.AddLongOption('u', "udf", "Load shared library with UDF by given path")
         .Optional()
@@ -292,7 +310,7 @@ void RunMain(int argc, const char* argv[]) {
 
     // Execution options
 
-    if (!schemeQueryFile && scriptQueryFiles.empty()) {
+    if (!schemeQueryFile && scriptQueryFiles.empty() && !runnerOptions.YdbSettings.MonitoringEnabled) {
         ythrow yexception() << "Nothing to execute";
     }
 

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

@@ -18,6 +18,7 @@ struct TYdbSetupSettings {
     TString DomainName = "Root";
     TDuration InitializationTimeout = TDuration::Seconds(10);
 
+    bool MonitoringEnabled = false;
     bool TraceOptEnabled = false;
     TMaybe<TString> LogOutputFile;
 

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

@@ -1,5 +1,7 @@
 #include "ydb_setup.h"
 
+#include <library/cpp/colorizer/colors.h>
+
 #include <ydb/core/kqp/common/kqp_script_executions.h>
 #include <ydb/core/kqp/proxy_service/kqp_script_executions.h>
 
@@ -112,12 +114,19 @@ class TYdbSetup::TImpl {
     NKikimr::Tests::TServerSettings GetServerSettings() {
         ui32 msgBusPort = PortManager_.GetPort();
 
-        NKikimr::Tests::TServerSettings serverSettings(msgBusPort);
+        NKikimr::Tests::TServerSettings serverSettings(msgBusPort, Settings_.AppConfig.GetAuthConfig(), Settings_.AppConfig.GetPQConfig());
         serverSettings.SetNodeCount(Settings_.NodeCount);
 
         serverSettings.SetDomainName(Settings_.DomainName);
         serverSettings.SetAppConfig(Settings_.AppConfig);
         serverSettings.SetFeatureFlags(Settings_.AppConfig.GetFeatureFlags());
+        serverSettings.SetControls(Settings_.AppConfig.GetImmediateControlsConfig());
+        serverSettings.SetCompactionConfig(Settings_.AppConfig.GetCompactionConfig());
+        serverSettings.PQClusterDiscoveryConfig = Settings_.AppConfig.GetPQClusterDiscoveryConfig();
+        serverSettings.NetClassifierConfig = Settings_.AppConfig.GetNetClassifierConfig();
+
+        const auto& kqpSettings = Settings_.AppConfig.GetKQPConfig().GetSettings();
+        serverSettings.SetKqpSettings({kqpSettings.begin(), kqpSettings.end()});
 
         serverSettings.SetCredentialsFactory(std::make_shared<TStaticSecuredCredentialsFactory>(Settings_.YqlToken));
         serverSettings.SetComputationFactory(Settings_.ComputationFactory);
@@ -127,6 +136,10 @@ class TYdbSetup::TImpl {
         SetLoggerSettings(serverSettings);
         SetFunctionRegistry(serverSettings);
 
+        if (Settings_.MonitoringEnabled) {
+            serverSettings.InitKikimrRunConfig();
+        }
+
         return serverSettings;
     }
 
@@ -177,13 +190,18 @@ class TYdbSetup::TImpl {
 public:
     explicit TImpl(const TYdbSetupSettings& settings)
         : Settings_(settings)
+        , CoutColors_(NColorizer::AutoColors(Cout))
     {
         InitializeYqlLogger();
         InitializeServer();
 
         if (Settings_.NodeCount > 1) {
             WaitResourcesPublishing();
         }
+
+        if (Settings_.MonitoringEnabled) {
+            Cout << CoutColors_.Cyan() << "Monitoring port: " << CoutColors_.Default() << Server_->GetRuntime()->GetMonPort() << Endl;
+        }
     }
 
     NKikimr::NKqp::TEvKqp::TEvQueryResponse::TPtr SchemeQueryRequest(const TString& query, const TString& traceId) const {
@@ -302,6 +320,7 @@ class TYdbSetup::TImpl {
 
 private:
     TYdbSetupSettings Settings_;
+    NColorizer::TColors CoutColors_;
 
     THolder<NKikimr::Tests::TServer> Server_;
     THolder<NKikimr::Tests::TClient> Client_;