From e435261595673cd61ad17858d04d3b84e1655c37 Mon Sep 17 00:00:00 2001 From: evanevanevanevannnn Date: Wed, 28 May 2025 17:12:40 +0000 Subject: [PATCH 1/4] new config --- .../yql/providers/solomon/provider/yql_solomon_config.cpp | 1 + .../yql/providers/solomon/provider/yql_solomon_config.h | 1 + .../solomon/provider/yql_solomon_datasource_type_ann.cpp | 5 +++++ 3 files changed, 7 insertions(+) diff --git a/ydb/library/yql/providers/solomon/provider/yql_solomon_config.cpp b/ydb/library/yql/providers/solomon/provider/yql_solomon_config.cpp index 3cb7e646688c..9485f423bde2 100644 --- a/ydb/library/yql/providers/solomon/provider/yql_solomon_config.cpp +++ b/ydb/library/yql/providers/solomon/provider/yql_solomon_config.cpp @@ -7,6 +7,7 @@ using namespace NCommon; TSolomonConfiguration::TSolomonConfiguration() { REGISTER_SETTING(*this, _EnableReading); + REGISTER_SETTING(*this, _EnableRuntimeListing); REGISTER_SETTING(*this, MetricsQueuePageSize); REGISTER_SETTING(*this, MetricsQueuePrefetchSize); REGISTER_SETTING(*this, MetricsQueueBatchCountLimit); diff --git a/ydb/library/yql/providers/solomon/provider/yql_solomon_config.h b/ydb/library/yql/providers/solomon/provider/yql_solomon_config.h index c4d7f12916aa..01d3de901c36 100644 --- a/ydb/library/yql/providers/solomon/provider/yql_solomon_config.h +++ b/ydb/library/yql/providers/solomon/provider/yql_solomon_config.h @@ -17,6 +17,7 @@ struct TSolomonSettings { #endif public: NCommon::TConfSetting _EnableReading; + NCommon::TConfSetting _EnableRuntimeListing; NCommon::TConfSetting MetricsQueuePageSize; NCommon::TConfSetting MetricsQueuePrefetchSize; NCommon::TConfSetting MetricsQueueBatchCountLimit; diff --git a/ydb/library/yql/providers/solomon/provider/yql_solomon_datasource_type_ann.cpp b/ydb/library/yql/providers/solomon/provider/yql_solomon_datasource_type_ann.cpp index 62fdbc211abd..aa36733e4655 100644 --- a/ydb/library/yql/providers/solomon/provider/yql_solomon_datasource_type_ann.cpp +++ b/ydb/library/yql/providers/solomon/provider/yql_solomon_datasource_type_ann.cpp @@ -91,6 +91,11 @@ class TSolomonDataSourceTypeAnnotationTransformer : public TVisitorTransformerBa } bool hasSelectors = !selectors.Content().empty(); + if (hasSelectors && !State_->Configuration->_EnableRuntimeListing.Get().GetOrElse(false)) { + ctx.AddError(TIssue(ctx.GetPosition(selectors.Pos()), "Runtime listing is disabled")); + return TStatus::Error; + } + auto& program = *input->Child(TSoSourceSettings::idx_Program); if (!EnsureAtom(program, ctx)) { return TStatus::Error; From 412f2533d051ca29af9a2c614cecf9a6aabbfa31 Mon Sep 17 00:00:00 2001 From: Ivan Sukhov Date: Wed, 28 May 2025 20:16:52 +0300 Subject: [PATCH 2/4] Update ydb/library/yql/providers/solomon/provider/yql_solomon_datasource_type_ann.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../solomon/provider/yql_solomon_datasource_type_ann.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ydb/library/yql/providers/solomon/provider/yql_solomon_datasource_type_ann.cpp b/ydb/library/yql/providers/solomon/provider/yql_solomon_datasource_type_ann.cpp index aa36733e4655..00ae5b030eb6 100644 --- a/ydb/library/yql/providers/solomon/provider/yql_solomon_datasource_type_ann.cpp +++ b/ydb/library/yql/providers/solomon/provider/yql_solomon_datasource_type_ann.cpp @@ -92,7 +92,7 @@ class TSolomonDataSourceTypeAnnotationTransformer : public TVisitorTransformerBa bool hasSelectors = !selectors.Content().empty(); if (hasSelectors && !State_->Configuration->_EnableRuntimeListing.Get().GetOrElse(false)) { - ctx.AddError(TIssue(ctx.GetPosition(selectors.Pos()), "Runtime listing is disabled")); + ctx.AddError(TIssue(ctx.GetPosition(selectors.Pos()), "Runtime listing is disabled. Please enable the '_EnableRuntimeListing' configuration parameter to proceed.")); return TStatus::Error; } From 9fdd027799aad789465a8ba4e7091e89d0209815 Mon Sep 17 00:00:00 2001 From: evanevanevanevannnn Date: Fri, 30 May 2025 09:17:36 +0000 Subject: [PATCH 3/4] fixed segfault --- .../providers/solomon/provider/yql_solomon_dq_integration.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/ydb/library/yql/providers/solomon/provider/yql_solomon_dq_integration.cpp b/ydb/library/yql/providers/solomon/provider/yql_solomon_dq_integration.cpp index 51f40b52a7d7..57672f19996e 100644 --- a/ydb/library/yql/providers/solomon/provider/yql_solomon_dq_integration.cpp +++ b/ydb/library/yql/providers/solomon/provider/yql_solomon_dq_integration.cpp @@ -367,6 +367,7 @@ class TSolomonDqIntegration: public TDqIntegrationBase { NDq::TDqSolomonReadParams readParams{ .Source = source }; + YQL_ENSURE(NActors::TlsActivationContext); auto metricsQueueActor = NActors::TActivationContext::ActorSystem()->Register( NDq::CreateSolomonMetricsQueueActor( std::min(maxTasksPerStage, totalMetricsCount), From d97cf1b915d86393f440a8f12d183f2b788ecb7d Mon Sep 17 00:00:00 2001 From: evanevanevanevannnn Date: Fri, 30 May 2025 09:32:34 +0000 Subject: [PATCH 4/4] fixed issues --- .../solomon/provider/yql_solomon_datasource_type_ann.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ydb/library/yql/providers/solomon/provider/yql_solomon_datasource_type_ann.cpp b/ydb/library/yql/providers/solomon/provider/yql_solomon_datasource_type_ann.cpp index 00ae5b030eb6..6cf6e144e7ab 100644 --- a/ydb/library/yql/providers/solomon/provider/yql_solomon_datasource_type_ann.cpp +++ b/ydb/library/yql/providers/solomon/provider/yql_solomon_datasource_type_ann.cpp @@ -92,7 +92,7 @@ class TSolomonDataSourceTypeAnnotationTransformer : public TVisitorTransformerBa bool hasSelectors = !selectors.Content().empty(); if (hasSelectors && !State_->Configuration->_EnableRuntimeListing.Get().GetOrElse(false)) { - ctx.AddError(TIssue(ctx.GetPosition(selectors.Pos()), "Runtime listing is disabled. Please enable the '_EnableRuntimeListing' configuration parameter to proceed.")); + ctx.AddError(TIssue(ctx.GetPosition(selectors.Pos()), "runtime listing is disabled, use `program` parameter")); return TStatus::Error; }