Skip to content

Commit eece934

Browse files
GrigoriyPAGrigoriyPA
authored
YQ kqprun, fixed settings passing (#16974)
1 parent d42149a commit eece934

File tree

5 files changed

+47
-50
lines changed

5 files changed

+47
-50
lines changed

‎ydb/tests/tools/fqrun/fqrun.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,10 @@ class TMain : public TMainBase {
551551
void SetupLogsConfig() {
552552
auto& logConfig = *RunnerOptions.FqSettings.AppConfig.MutableLogConfig();
553553

554+
if (DefaultLogPriority) {
555+
logConfig.SetDefaultLevel(*DefaultLogPriority);
556+
}
557+
554558
if (FqLogPriority) {
555559
std::unordered_map<NKikimrServices::EServiceKikimr, NActors::NLog::EPriority> fqLogPriorities;
556560
std::unordered_set<TString> prefixes = {

‎ydb/tests/tools/fqrun/src/fq_setup.cpp‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ class TFqSetup::TImpl : public TKikimrSetupBase {
3333

3434
private:
3535
NKikimr::Tests::TServerSettings GetServerSettings(ui32 grpcPort) {
36-
auto serverSettings = TBase::GetServerSettings(grpcPort, Settings.VerboseLevel >= EVerbose::InitLogs);
36+
auto serverSettings = TBase::GetServerSettings(Settings, grpcPort, Settings.VerboseLevel >= EVerbose::InitLogs);
37+
38+
serverSettings.SetEnableYqGrpc(true);
3739

3840
return serverSettings;
3941
}
@@ -178,8 +180,7 @@ class TFqSetup::TImpl : public TKikimrSetupBase {
178180

179181
public:
180182
explicit TImpl(const TFqSetupSettings& settings)
181-
: TBase(settings)
182-
, Settings(settings)
183+
: Settings(settings)
183184
{
184185
const ui32 grpcPort = Settings.FirstGrpcPort ? Settings.FirstGrpcPort : PortManager.GetPort();
185186
if (Settings.GrpcEnabled && Settings.VerboseLevel >= EVerbose::Info) {
@@ -270,7 +271,7 @@ class TFqSetup::TImpl : public TKikimrSetupBase {
270271
ythrow yexception() << "Trace opt was disabled";
271272
}
272273

273-
NYql::NLog::YqlLogger().ResetBackend(CreateLogBackend());
274+
NYql::NLog::YqlLogger().ResetBackend(CreateLogBackend(Settings));
274275
}
275276

276277
static void StopTraceOpt() {

‎ydb/tests/tools/kqprun/runlib/kikimr_setup.cpp‎

Lines changed: 30 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -58,75 +58,71 @@ class TStaticSecuredCredentialsFactory : public NYql::ISecuredServiceAccountCred
5858

5959
} // anonymous namespace
6060

61-
TKikimrSetupBase::TKikimrSetupBase(const TServerSettings& settings)
62-
: Settings(settings)
63-
{}
64-
65-
TAutoPtr<TLogBackend> TKikimrSetupBase::CreateLogBackend() const {
66-
if (Settings.LogOutputFile) {
67-
return NActors::CreateFileBackend(Settings.LogOutputFile);
61+
TAutoPtr<TLogBackend> TKikimrSetupBase::CreateLogBackend(const TServerSettings& settings) const {
62+
if (settings.LogOutputFile) {
63+
return NActors::CreateFileBackend(settings.LogOutputFile);
6864
} else {
6965
return NActors::CreateStderrBackend();
7066
}
7167
}
7268

73-
NKikimr::Tests::TServerSettings TKikimrSetupBase::GetServerSettings(ui32 grpcPort, bool verbose) {
69+
NKikimr::Tests::TServerSettings TKikimrSetupBase::GetServerSettings(const TServerSettings& settings, ui32 grpcPort, bool verbose) {
7470
const ui32 msgBusPort = PortManager.GetPort();
7571

76-
NKikimr::Tests::TServerSettings serverSettings(msgBusPort, Settings.AppConfig.GetAuthConfig(), Settings.AppConfig.GetPQConfig());
77-
serverSettings.SetNodeCount(Settings.NodeCount);
72+
NKikimr::Tests::TServerSettings serverSettings(msgBusPort, settings.AppConfig.GetAuthConfig(), settings.AppConfig.GetPQConfig());
73+
serverSettings.SetNodeCount(settings.NodeCount);
7874

79-
serverSettings.SetDomainName(TString(NKikimr::ExtractDomain(NKikimr::CanonizePath(Settings.DomainName))));
80-
serverSettings.SetAppConfig(Settings.AppConfig);
81-
serverSettings.SetFeatureFlags(Settings.AppConfig.GetFeatureFlags());
82-
serverSettings.SetControls(Settings.AppConfig.GetImmediateControlsConfig());
83-
serverSettings.SetCompactionConfig(Settings.AppConfig.GetCompactionConfig());
84-
serverSettings.PQClusterDiscoveryConfig = Settings.AppConfig.GetPQClusterDiscoveryConfig();
85-
serverSettings.NetClassifierConfig = Settings.AppConfig.GetNetClassifierConfig();
75+
serverSettings.SetDomainName(TString(NKikimr::ExtractDomain(NKikimr::CanonizePath(settings.DomainName))));
76+
serverSettings.SetAppConfig(settings.AppConfig);
77+
serverSettings.SetFeatureFlags(settings.AppConfig.GetFeatureFlags());
78+
serverSettings.SetControls(settings.AppConfig.GetImmediateControlsConfig());
79+
serverSettings.SetCompactionConfig(settings.AppConfig.GetCompactionConfig());
80+
serverSettings.PQClusterDiscoveryConfig = settings.AppConfig.GetPQClusterDiscoveryConfig();
81+
serverSettings.NetClassifierConfig = settings.AppConfig.GetNetClassifierConfig();
8682

87-
const auto& kqpSettings = Settings.AppConfig.GetKQPConfig().GetSettings();
83+
const auto& kqpSettings = settings.AppConfig.GetKQPConfig().GetSettings();
8884
serverSettings.SetKqpSettings({kqpSettings.begin(), kqpSettings.end()});
8985

90-
serverSettings.SetCredentialsFactory(std::make_shared<TStaticSecuredCredentialsFactory>(Settings.YqlToken));
91-
serverSettings.SetComputationFactory(Settings.ComputationFactory);
92-
serverSettings.SetYtGateway(Settings.YtGateway);
86+
serverSettings.SetCredentialsFactory(std::make_shared<TStaticSecuredCredentialsFactory>(settings.YqlToken));
87+
serverSettings.SetComputationFactory(settings.ComputationFactory);
88+
serverSettings.SetYtGateway(settings.YtGateway);
9389
serverSettings.S3ActorsFactory = NYql::NDq::CreateS3ActorsFactory();
9490
serverSettings.SetDqTaskTransformFactory(NYql::CreateYtDqTaskTransformFactory(true));
9591
serverSettings.SetInitializeFederatedQuerySetupFactory(true);
9692
serverSettings.SetVerbose(verbose);
9793
serverSettings.SetNeedStatsCollectors(true);
9894

99-
SetLoggerSettings(serverSettings);
100-
SetFunctionRegistry(serverSettings);
95+
SetLoggerSettings(settings, serverSettings);
96+
SetFunctionRegistry(settings, serverSettings);
10197

102-
if (Settings.MonitoringEnabled) {
98+
if (settings.MonitoringEnabled) {
10399
serverSettings.InitKikimrRunConfig();
104-
serverSettings.SetMonitoringPortOffset(Settings.FirstMonitoringPort, true);
100+
serverSettings.SetMonitoringPortOffset(settings.FirstMonitoringPort, true);
105101
}
106102

107-
if (Settings.GrpcEnabled) {
103+
if (settings.GrpcEnabled) {
108104
serverSettings.SetGrpcPort(grpcPort);
109105
}
110106

111107
return serverSettings;
112108
}
113109

114-
void TKikimrSetupBase::SetLoggerSettings(NKikimr::Tests::TServerSettings& serverSettings) const {
115-
auto loggerInitializer = [this](NActors::TTestActorRuntime& runtime) {
116-
InitLogSettings(Settings.AppConfig.GetLogConfig(), runtime);
117-
runtime.SetLogBackendFactory([this]() { return CreateLogBackend(); });
110+
void TKikimrSetupBase::SetLoggerSettings(const TServerSettings& settings, NKikimr::Tests::TServerSettings& serverSettings) const {
111+
auto loggerInitializer = [this, settings](NActors::TTestActorRuntime& runtime) {
112+
InitLogSettings(settings.AppConfig.GetLogConfig(), runtime);
113+
runtime.SetLogBackendFactory([this, settings]() { return CreateLogBackend(settings); });
118114
};
119115

120116
serverSettings.SetLoggerInitializer(loggerInitializer);
121117
}
122118

123-
void TKikimrSetupBase::SetFunctionRegistry(NKikimr::Tests::TServerSettings& serverSettings) const {
124-
if (!Settings.FunctionRegistry) {
119+
void TKikimrSetupBase::SetFunctionRegistry(const TServerSettings& settings, NKikimr::Tests::TServerSettings& serverSettings) const {
120+
if (!settings.FunctionRegistry) {
125121
return;
126122
}
127123

128-
auto functionRegistryFactory = [this](const NKikimr::NScheme::TTypeRegistry&) {
129-
return Settings.FunctionRegistry.Get();
124+
auto functionRegistryFactory = [settings](const NKikimr::NScheme::TTypeRegistry&) {
125+
return settings.FunctionRegistry.Get();
130126
};
131127

132128
serverSettings.SetFrFactory(functionRegistryFactory);

‎ydb/tests/tools/kqprun/runlib/kikimr_setup.h‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,19 @@ namespace NKikimrRun {
1010

1111
class TKikimrSetupBase {
1212
public:
13-
TKikimrSetupBase(const TServerSettings& settings);
13+
TKikimrSetupBase() = default;
1414

15-
TAutoPtr<TLogBackend> CreateLogBackend() const;
15+
TAutoPtr<TLogBackend> CreateLogBackend(const TServerSettings& settings) const;
1616

17-
NKikimr::Tests::TServerSettings GetServerSettings(ui32 grpcPort, bool verbose);
17+
NKikimr::Tests::TServerSettings GetServerSettings(const TServerSettings& settings, ui32 grpcPort, bool verbose);
1818

1919
private:
20-
void SetLoggerSettings(NKikimr::Tests::TServerSettings& serverSettings) const;
20+
void SetLoggerSettings(const TServerSettings& settings, NKikimr::Tests::TServerSettings& serverSettings) const;
2121

22-
void SetFunctionRegistry(NKikimr::Tests::TServerSettings& serverSettings) const;
22+
void SetFunctionRegistry(const TServerSettings& settings, NKikimr::Tests::TServerSettings& serverSettings) const;
2323

2424
protected:
2525
TPortManager PortManager;
26-
27-
private:
28-
const TServerSettings& Settings;
2926
};
3027

3128
} // namespace NKikimrRun

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ class TYdbSetup::TImpl : public TKikimrSetupBase {
177177
}
178178

179179
NKikimr::Tests::TServerSettings GetServerSettings(ui32 grpcPort) {
180-
auto serverSettings = TBase::GetServerSettings(grpcPort, Settings_.VerboseLevel >= EVerbose::InitLogs);
180+
auto serverSettings = TBase::GetServerSettings(Settings_, grpcPort, Settings_.VerboseLevel >= EVerbose::InitLogs);
181181

182182
SetStorageSettings(serverSettings);
183183

@@ -364,8 +364,7 @@ class TYdbSetup::TImpl : public TKikimrSetupBase {
364364

365365
public:
366366
explicit TImpl(const TYdbSetupSettings& settings)
367-
: TBase(settings)
368-
, Settings_(settings)
367+
: Settings_(settings)
369368
, CoutColors_(NColorizer::AutoColors(Cout))
370369
{
371370
InitializeYqlLogger();
@@ -501,7 +500,7 @@ class TYdbSetup::TImpl : public TKikimrSetupBase {
501500
ythrow yexception() << "Trace opt was disabled";
502501
}
503502

504-
NYql::NLog::YqlLogger().ResetBackend(CreateLogBackend());
503+
NYql::NLog::YqlLogger().ResetBackend(CreateLogBackend(Settings_));
505504
}
506505

507506
static void StopTraceOpt() {

0 commit comments

Comments
 (0)