YQ kqprun, fixed settings passing (#16974)

5 files changed, 47 insertions, 50 deletions

diff --git a/ydb/tests/tools/fqrun/fqrun.cpp b/ydb/tests/tools/fqrun/fqrun.cpp
index ec68a177a9a..7e2cc0613a6 100644
--- a/ydb/tests/tools/fqrun/fqrun.cpp
+++ b/ydb/tests/tools/fqrun/fqrun.cpp
@@ -551,6 +551,10 @@ private:
     void SetupLogsConfig() {
         auto& logConfig = *RunnerOptions.FqSettings.AppConfig.MutableLogConfig();
 
+        if (DefaultLogPriority) {
+            logConfig.SetDefaultLevel(*DefaultLogPriority);
+        }
+
         if (FqLogPriority) {
             std::unordered_map<NKikimrServices::EServiceKikimr, NActors::NLog::EPriority> fqLogPriorities;
             std::unordered_set<TString> prefixes = {
diff --git a/ydb/tests/tools/fqrun/src/fq_setup.cpp b/ydb/tests/tools/fqrun/src/fq_setup.cpp
index 647ef74ebf1..066d6d01dbf 100644
--- a/ydb/tests/tools/fqrun/src/fq_setup.cpp
+++ b/ydb/tests/tools/fqrun/src/fq_setup.cpp
@@ -33,7 +33,9 @@ class TFqSetup::TImpl : public TKikimrSetupBase {
 
 private:
     NKikimr::Tests::TServerSettings GetServerSettings(ui32 grpcPort) {
-        auto serverSettings = TBase::GetServerSettings(grpcPort, Settings.VerboseLevel >= EVerbose::InitLogs);
+        auto serverSettings = TBase::GetServerSettings(Settings, grpcPort, Settings.VerboseLevel >= EVerbose::InitLogs);
+
+        serverSettings.SetEnableYqGrpc(true);
 
         return serverSettings;
     }
@@ -178,8 +180,7 @@ private:
 
 public:
     explicit TImpl(const TFqSetupSettings& settings)
-        : TBase(settings)
-        , Settings(settings)
+        : Settings(settings)
     {
         const ui32 grpcPort = Settings.FirstGrpcPort ? Settings.FirstGrpcPort : PortManager.GetPort();
         if (Settings.GrpcEnabled && Settings.VerboseLevel >= EVerbose::Info) {
@@ -270,7 +271,7 @@ public:
             ythrow yexception() << "Trace opt was disabled";
         }
 
-        NYql::NLog::YqlLogger().ResetBackend(CreateLogBackend());
+        NYql::NLog::YqlLogger().ResetBackend(CreateLogBackend(Settings));
     }
 
     static void StopTraceOpt() {
diff --git a/ydb/tests/tools/kqprun/runlib/kikimr_setup.cpp b/ydb/tests/tools/kqprun/runlib/kikimr_setup.cpp
index db98a5b05ab..4d241becf2b 100644
--- a/ydb/tests/tools/kqprun/runlib/kikimr_setup.cpp
+++ b/ydb/tests/tools/kqprun/runlib/kikimr_setup.cpp
@@ -58,75 +58,71 @@ private:
 
 }  // anonymous namespace
 
-TKikimrSetupBase::TKikimrSetupBase(const TServerSettings& settings)
-    : Settings(settings)
-{}
-
-TAutoPtr<TLogBackend> TKikimrSetupBase::CreateLogBackend() const {
-    if (Settings.LogOutputFile) {
-        return NActors::CreateFileBackend(Settings.LogOutputFile);
+TAutoPtr<TLogBackend> TKikimrSetupBase::CreateLogBackend(const TServerSettings& settings) const {
+    if (settings.LogOutputFile) {
+        return NActors::CreateFileBackend(settings.LogOutputFile);
     } else {
         return NActors::CreateStderrBackend();
     }
 }
 
-NKikimr::Tests::TServerSettings TKikimrSetupBase::GetServerSettings(ui32 grpcPort, bool verbose) {
+NKikimr::Tests::TServerSettings TKikimrSetupBase::GetServerSettings(const TServerSettings& settings, ui32 grpcPort, bool verbose) {
     const ui32 msgBusPort = PortManager.GetPort();
 
-    NKikimr::Tests::TServerSettings serverSettings(msgBusPort, Settings.AppConfig.GetAuthConfig(), Settings.AppConfig.GetPQConfig());
-    serverSettings.SetNodeCount(Settings.NodeCount);
+    NKikimr::Tests::TServerSettings serverSettings(msgBusPort, settings.AppConfig.GetAuthConfig(), settings.AppConfig.GetPQConfig());
+    serverSettings.SetNodeCount(settings.NodeCount);
 
-    serverSettings.SetDomainName(TString(NKikimr::ExtractDomain(NKikimr::CanonizePath(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();
+    serverSettings.SetDomainName(TString(NKikimr::ExtractDomain(NKikimr::CanonizePath(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();
+    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);
-    serverSettings.SetYtGateway(Settings.YtGateway);
+    serverSettings.SetCredentialsFactory(std::make_shared<TStaticSecuredCredentialsFactory>(settings.YqlToken));
+    serverSettings.SetComputationFactory(settings.ComputationFactory);
+    serverSettings.SetYtGateway(settings.YtGateway);
     serverSettings.S3ActorsFactory = NYql::NDq::CreateS3ActorsFactory();
     serverSettings.SetDqTaskTransformFactory(NYql::CreateYtDqTaskTransformFactory(true));
     serverSettings.SetInitializeFederatedQuerySetupFactory(true);
     serverSettings.SetVerbose(verbose);
     serverSettings.SetNeedStatsCollectors(true);
 
-    SetLoggerSettings(serverSettings);
-    SetFunctionRegistry(serverSettings);
+    SetLoggerSettings(settings, serverSettings);
+    SetFunctionRegistry(settings, serverSettings);
 
-    if (Settings.MonitoringEnabled) {
+    if (settings.MonitoringEnabled) {
         serverSettings.InitKikimrRunConfig();
-        serverSettings.SetMonitoringPortOffset(Settings.FirstMonitoringPort, true);
+        serverSettings.SetMonitoringPortOffset(settings.FirstMonitoringPort, true);
     }
 
-    if (Settings.GrpcEnabled) {
+    if (settings.GrpcEnabled) {
         serverSettings.SetGrpcPort(grpcPort);
     }
 
     return serverSettings;
 }
 
-void TKikimrSetupBase::SetLoggerSettings(NKikimr::Tests::TServerSettings& serverSettings) const {
-    auto loggerInitializer = [this](NActors::TTestActorRuntime& runtime) {
-        InitLogSettings(Settings.AppConfig.GetLogConfig(), runtime);
-        runtime.SetLogBackendFactory([this]() { return CreateLogBackend(); });
+void TKikimrSetupBase::SetLoggerSettings(const TServerSettings& settings, NKikimr::Tests::TServerSettings& serverSettings) const {
+    auto loggerInitializer = [this, settings](NActors::TTestActorRuntime& runtime) {
+        InitLogSettings(settings.AppConfig.GetLogConfig(), runtime);
+        runtime.SetLogBackendFactory([this, settings]() { return CreateLogBackend(settings); });
     };
 
     serverSettings.SetLoggerInitializer(loggerInitializer);
 }
 
-void TKikimrSetupBase::SetFunctionRegistry(NKikimr::Tests::TServerSettings& serverSettings) const {
-    if (!Settings.FunctionRegistry) {
+void TKikimrSetupBase::SetFunctionRegistry(const TServerSettings& settings, NKikimr::Tests::TServerSettings& serverSettings) const {
+    if (!settings.FunctionRegistry) {
         return;
     }
 
-    auto functionRegistryFactory = [this](const NKikimr::NScheme::TTypeRegistry&) {
-        return Settings.FunctionRegistry.Get();
+    auto functionRegistryFactory = [settings](const NKikimr::NScheme::TTypeRegistry&) {
+        return settings.FunctionRegistry.Get();
     };
 
     serverSettings.SetFrFactory(functionRegistryFactory);
diff --git a/ydb/tests/tools/kqprun/runlib/kikimr_setup.h b/ydb/tests/tools/kqprun/runlib/kikimr_setup.h
index fc02bcf3e2b..3c0b7fa27d5 100644
--- a/ydb/tests/tools/kqprun/runlib/kikimr_setup.h
+++ b/ydb/tests/tools/kqprun/runlib/kikimr_setup.h
@@ -10,22 +10,19 @@ namespace NKikimrRun {
 
 class TKikimrSetupBase {
 public:
-    TKikimrSetupBase(const TServerSettings& settings);
+    TKikimrSetupBase() = default;
 
-    TAutoPtr<TLogBackend> CreateLogBackend() const;
+    TAutoPtr<TLogBackend> CreateLogBackend(const TServerSettings& settings) const;
 
-    NKikimr::Tests::TServerSettings GetServerSettings(ui32 grpcPort, bool verbose);
+    NKikimr::Tests::TServerSettings GetServerSettings(const TServerSettings& settings, ui32 grpcPort, bool verbose);
 
 private:
-    void SetLoggerSettings(NKikimr::Tests::TServerSettings& serverSettings) const;
+    void SetLoggerSettings(const TServerSettings& settings, NKikimr::Tests::TServerSettings& serverSettings) const;
 
-    void SetFunctionRegistry(NKikimr::Tests::TServerSettings& serverSettings) const;
+    void SetFunctionRegistry(const TServerSettings& settings, NKikimr::Tests::TServerSettings& serverSettings) const;
 
 protected:
     TPortManager PortManager;
-
-private:
-    const TServerSettings& Settings;
 };
 
 }  // namespace NKikimrRun
diff --git a/ydb/tests/tools/kqprun/src/ydb_setup.cpp b/ydb/tests/tools/kqprun/src/ydb_setup.cpp
index 46157889643..83e2c0923dd 100644
--- a/ydb/tests/tools/kqprun/src/ydb_setup.cpp
+++ b/ydb/tests/tools/kqprun/src/ydb_setup.cpp
@@ -177,7 +177,7 @@ private:
     }
 
     NKikimr::Tests::TServerSettings GetServerSettings(ui32 grpcPort) {
-        auto serverSettings = TBase::GetServerSettings(grpcPort, Settings_.VerboseLevel >= EVerbose::InitLogs);
+        auto serverSettings = TBase::GetServerSettings(Settings_, grpcPort, Settings_.VerboseLevel >= EVerbose::InitLogs);
 
         SetStorageSettings(serverSettings);
 
@@ -364,8 +364,7 @@ private:
 
 public:
     explicit TImpl(const TYdbSetupSettings& settings)
-        : TBase(settings)
-        , Settings_(settings)
+        : Settings_(settings)
         , CoutColors_(NColorizer::AutoColors(Cout))
     {
         InitializeYqlLogger();
@@ -501,7 +500,7 @@ public:
             ythrow yexception() << "Trace opt was disabled";
         }
 
-        NYql::NLog::YqlLogger().ResetBackend(CreateLogBackend());
+        NYql::NLog::YqlLogger().ResetBackend(CreateLogBackend(Settings_));
     }
 
     static void StopTraceOpt() {