diff options
| author | galaxycrab <UgnineSirdis@ydb.tech> | 2022-10-06 13:28:13 +0300 |
|---|---|---|
| committer | galaxycrab <UgnineSirdis@ydb.tech> | 2022-10-06 13:28:13 +0300 |
| commit | c86ae1ef6f8a32a458e2d0536ce98edc7f037885 (patch) | |
| tree | afe15d77310cb1b4f8c6be173ebf26ccbffdf6cd | |
| parent | 2fe2ca32ad3db605707d9dd760b3a2482ba1c3cf (diff) | |
| download | ydb-c86ae1ef6f8a32a458e2d0536ce98edc7f037885.tar.gz | |
Refactor yq.txt config name
20 files changed, 53 insertions, 42 deletions
diff --git a/ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp b/ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp index 0f75933678..80208f1406 100644 --- a/ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp +++ b/ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp @@ -227,7 +227,8 @@ protected: config.Opts->AddLongOption("cms-file", "CMS config file").OptionalArgument("PATH"); config.Opts->AddLongOption("alloc-file", "Allocator config file").OptionalArgument("PATH"); config.Opts->AddLongOption("yql-file", "Yql Analytics config file").OptionalArgument("PATH"); - config.Opts->AddLongOption("yq-file", "Yandex Query config file").OptionalArgument("PATH"); + config.Opts->AddLongOption("yq-file", "Yandex Query config file (deprecated)").OptionalArgument("PATH"); + config.Opts->AddLongOption("fq-file", "Federated Query config file").OptionalArgument("PATH"); config.Opts->AddLongOption("feature-flags-file", "File with feature flags to turn new features on/off").OptionalArgument("PATH"); config.Opts->AddLongOption("rb-file", "File with resource broker customizations").OptionalArgument("PATH"); config.Opts->AddLongOption("metering-file", "File with metering config").OptionalArgument("PATH"); @@ -467,7 +468,8 @@ protected: OPTION("kqp-file", KQPConfig); OPTION("incrhuge-file", IncrHugeConfig); OPTION("alloc-file", AllocatorConfig); - OPTION("yq-file", YandexQueryConfig); + OPTION("yq-file", FederatedQueryConfig); // TODO: remove after migration (YQ-1467) + OPTION("fq-file", FederatedQueryConfig); OPTION(nullptr, TracingConfig); OPTION(nullptr, FailureInjectionConfig); @@ -534,8 +536,8 @@ protected: RunConfig.NodeId = NodeId; if (NodeKind == NODE_KIND_YQ && InterconnectPort) { - auto& yqConfig = *AppConfig.MutableYandexQueryConfig(); - auto& nmConfig = *yqConfig.MutableNodesManager(); + auto& fqConfig = *AppConfig.MutableFederatedQueryConfig(); + auto& nmConfig = *fqConfig.MutableNodesManager(); nmConfig.SetPort(InterconnectPort); nmConfig.SetHost(HostName()); } @@ -655,8 +657,8 @@ protected: } if (config.ParseResult->Has("data-center")) { - if (AppConfig.HasYandexQueryConfig()) { - AppConfig.MutableYandexQueryConfig()->MutableNodesManager()->SetDataCenter(to_lower(DataCenter)); + if (AppConfig.HasFederatedQueryConfig()) { + AppConfig.MutableFederatedQueryConfig()->MutableNodesManager()->SetDataCenter(to_lower(DataCenter)); } } @@ -811,6 +813,10 @@ protected: } } } + // TODO: remove after migration (YQ-1467) + if (AppConfig.HasYandexQueryConfig()) { + AppConfig.MutableFederatedQueryConfig()->MergeFrom(AppConfig.GetYandexQueryConfig()); + } } inline bool LoadBootstrapConfig(TConfig& config) { diff --git a/ydb/core/driver_lib/run/config_parser.cpp b/ydb/core/driver_lib/run/config_parser.cpp index 5d1d1a1388..f00f7d5760 100644 --- a/ydb/core/driver_lib/run/config_parser.cpp +++ b/ydb/core/driver_lib/run/config_parser.cpp @@ -75,7 +75,8 @@ void TRunCommandConfigParser::SetupLastGetOptForConfigFiles(NLastGetopt::TOpts& opts.AddLongOption("http-proxy-file", "Http proxy config file").OptionalArgument("PATH"); opts.AddLongOption("alloc-file", "Allocator config file").OptionalArgument("PATH"); opts.AddLongOption("yql-file", "Yql Analytics config file").OptionalArgument("PATH"); - opts.AddLongOption("yq-file", "Yandex Query config file").OptionalArgument("PATH"); + opts.AddLongOption("yq-file", "Yandex Query config file (deprecated)").OptionalArgument("PATH"); + opts.AddLongOption("fq-file", "Federated Query config file").OptionalArgument("PATH"); opts.AddLongOption("pdisk-key-file", "pdisk encryption key config file").OptionalArgument("PATH"); opts.AddLongOption("public-http-file", "Public HTTP config file").OptionalArgument("PATH"); } @@ -210,8 +211,10 @@ void TRunCommandConfigParser::ParseConfigFiles(const NLastGetopt::TOptsParseResu Config.AppConfig.MutableAllocatorConfig()->CopyFrom(*allocConfig); } - if (res.Has("yq-file")) { - Y_VERIFY(ParsePBFromFile(res.Get("yq-file"), Config.AppConfig.MutableYandexQueryConfig())); + if (res.Has("fq-file")) { + Y_VERIFY(ParsePBFromFile(res.Get("fq-file"), Config.AppConfig.MutableFederatedQueryConfig())); + } else if (res.Has("yq-file")) { + Y_VERIFY(ParsePBFromFile(res.Get("yq-file"), Config.AppConfig.MutableFederatedQueryConfig())); } if (res.Has("public-http-file")) { diff --git a/ydb/core/driver_lib/run/kikimr_services_initializers.cpp b/ydb/core/driver_lib/run/kikimr_services_initializers.cpp index f50af449f6..b96f1c6508 100644 --- a/ydb/core/driver_lib/run/kikimr_services_initializers.cpp +++ b/ydb/core/driver_lib/run/kikimr_services_initializers.cpp @@ -199,7 +199,7 @@ namespace NKikimr { namespace NKikimrServicesInitializers { -ui32 TYandexQueryInitializer::IcPort = 0; +ui32 TFederatedQueryInitializer::IcPort = 0; IKikimrServicesInitializer::IKikimrServicesInitializer(const TKikimrRunConfig& runConfig) : Config(runConfig.AppConfig) @@ -742,7 +742,7 @@ void TBasicServicesInitializer::InitializeServices(NActors::TActorSystemSetup* s setup->Interconnect.ProxyActors[destId] = TActorSetupCmd(new TInterconnectProxyTCP(destId, icCommon), TMailboxType::ReadAsFilled, interconnectPoolId); } else { - TYandexQueryInitializer::SetIcPort(node.second.second); + TFederatedQueryInitializer::SetIcPort(node.second.second); icCommon->TechnicalSelfHostName = node.second.Host; TString address; if (node.second.first) @@ -779,10 +779,10 @@ void TBasicServicesInitializer::InitializeServices(NActors::TActorSystemSetup* s } if (!IsServiceInitialized(setup, MakeInterconnectListenerActorId(false)) && !IsServiceInitialized(setup, MakeInterconnectListenerActorId(true))) { - if (Config.HasYandexQueryConfig() && Config.GetYandexQueryConfig().GetEnabled()) { - auto& nodesManagerConfig = Config.GetYandexQueryConfig().GetNodesManager(); + if (Config.HasFederatedQueryConfig() && Config.GetFederatedQueryConfig().GetEnabled()) { + auto& nodesManagerConfig = Config.GetFederatedQueryConfig().GetNodesManager(); if (nodesManagerConfig.GetEnabled()) { - TYandexQueryInitializer::SetIcPort(nodesManagerConfig.GetPort()); + TFederatedQueryInitializer::SetIcPort(nodesManagerConfig.GetPort()); icCommon->TechnicalSelfHostName = nodesManagerConfig.GetHost(); auto listener = new TInterconnectListenerTCP({}, nodesManagerConfig.GetPort(), icCommon); if (int err = listener->Bind()) { @@ -2312,19 +2312,19 @@ void THealthCheckInitializer::InitializeServices(TActorSystemSetup* setup, const TActorSetupCmd(NHealthCheck::CreateHealthCheckService(), TMailboxType::HTSwap, appData->UserPoolId))); } -TYandexQueryInitializer::TYandexQueryInitializer(const TKikimrRunConfig& runConfig, std::shared_ptr<TModuleFactories> factories, NYq::IYqSharedResources::TPtr yqSharedResources) +TFederatedQueryInitializer::TFederatedQueryInitializer(const TKikimrRunConfig& runConfig, std::shared_ptr<TModuleFactories> factories, NYq::IYqSharedResources::TPtr yqSharedResources) : IKikimrServicesInitializer(runConfig) , Factories(std::move(factories)) , YqSharedResources(std::move(yqSharedResources)) { } -void TYandexQueryInitializer::SetIcPort(ui32 icPort) { +void TFederatedQueryInitializer::SetIcPort(ui32 icPort) { IcPort = icPort; } -void TYandexQueryInitializer::InitializeServices(TActorSystemSetup* setup, const TAppData* appData) { - const auto& protoConfig = Config.GetYandexQueryConfig(); +void TFederatedQueryInitializer::InitializeServices(TActorSystemSetup* setup, const TAppData* appData) { + const auto& protoConfig = Config.GetFederatedQueryConfig(); if (!protoConfig.GetEnabled()) { return; } diff --git a/ydb/core/driver_lib/run/kikimr_services_initializers.h b/ydb/core/driver_lib/run/kikimr_services_initializers.h index e98898c39b..648026c5ac 100644 --- a/ydb/core/driver_lib/run/kikimr_services_initializers.h +++ b/ydb/core/driver_lib/run/kikimr_services_initializers.h @@ -492,9 +492,9 @@ public: void InitializeServices(NActors::TActorSystemSetup* setup, const NKikimr::TAppData* appData) override; }; -class TYandexQueryInitializer : public IKikimrServicesInitializer { +class TFederatedQueryInitializer : public IKikimrServicesInitializer { public: - TYandexQueryInitializer(const TKikimrRunConfig& runConfig, std::shared_ptr<TModuleFactories> factories, NYq::IYqSharedResources::TPtr yqSharedResources); + TFederatedQueryInitializer(const TKikimrRunConfig& runConfig, std::shared_ptr<TModuleFactories> factories, NYq::IYqSharedResources::TPtr yqSharedResources); void InitializeServices(NActors::TActorSystemSetup* setup, const NKikimr::TAppData* appData) override; diff --git a/ydb/core/driver_lib/run/run.cpp b/ydb/core/driver_lib/run/run.cpp index f6dd469b8a..601861caeb 100644 --- a/ydb/core/driver_lib/run/run.cpp +++ b/ydb/core/driver_lib/run/run.cpp @@ -1041,7 +1041,7 @@ void TKikimrRunner::InitializeAppData(const TKikimrRunConfig& runConfig) } if (runConfig.AppConfig.HasBootstrapConfig()) { - AppData->BootstrapConfig = runConfig.AppConfig.GetBootstrapConfig(); + AppData->BootstrapConfig = runConfig.AppConfig.GetBootstrapConfig(); } // setup resource profiles @@ -1474,10 +1474,10 @@ TIntrusivePtr<TServiceInitializersList> TKikimrRunner::CreateServiceInitializers sil->AddServiceInitializer(new TYqlLogsInitializer(runConfig)); } - if (serviceMask.EnableYandexQuery && runConfig.AppConfig.GetYandexQueryConfig().GetEnabled()) { - YqSharedResources = NYq::CreateYqSharedResources(runConfig.AppConfig.GetYandexQueryConfig(), + if (serviceMask.EnableYandexQuery && runConfig.AppConfig.GetFederatedQueryConfig().GetEnabled()) { + YqSharedResources = NYq::CreateYqSharedResources(runConfig.AppConfig.GetFederatedQueryConfig(), ModuleFactories->YdbCredentialProviderFactory, Counters->GetSubgroup("counters", "yq")); - sil->AddServiceInitializer(new TYandexQueryInitializer(runConfig, ModuleFactories, YqSharedResources)); + sil->AddServiceInitializer(new TFederatedQueryInitializer(runConfig, ModuleFactories, YqSharedResources)); } if (serviceMask.EnableSequenceProxyService) { diff --git a/ydb/core/protos/config.proto b/ydb/core/protos/config.proto index aac04f767f..719212cb6e 100644 --- a/ydb/core/protos/config.proto +++ b/ydb/core/protos/config.proto @@ -26,7 +26,7 @@ import "ydb/core/protos/auth.proto"; import "ydb/core/protos/key.proto"; import "ydb/core/protos/alloc.proto"; import "ydb/core/protos/node_limits.proto"; -import "ydb/core/yq/libs/config/protos/yq_config.proto"; +import "ydb/core/yq/libs/config/protos/fq_config.proto"; package NKikimrConfig; option java_package = "ru.yandex.kikimr.proto"; @@ -1627,7 +1627,7 @@ message TAppConfig { optional TMeteringConfig MeteringConfig = 45; optional THiveConfig HiveConfig = 46; optional TDataShardConfig DataShardConfig = 49; - optional NYq.NConfig.TConfig YandexQueryConfig = 50; + optional NYq.NConfig.TConfig FederatedQueryConfig = 58; optional TCompactionConfig CompactionConfig = 52; optional THttpProxyConfig HttpProxyConfig = 53; optional TSchemeShardConfig SchemeShardConfig = 54; @@ -1635,6 +1635,8 @@ message TAppConfig { optional TFailureInjectionConfig FailureInjectionConfig = 56; optional THttpProxyConfig PublicHttpConfig = 57; + optional NYq.NConfig.TConfig YandexQueryConfig = 50; // TODO: remove after migration to FederatedQueryConfig + repeated TNamedConfig NamedConfigs = 100; optional string ClusterYamlConfig = 101; diff --git a/ydb/core/protos/console_config.proto b/ydb/core/protos/console_config.proto index b17d871bd5..ac7ecbf9ae 100644 --- a/ydb/core/protos/console_config.proto +++ b/ydb/core/protos/console_config.proto @@ -109,7 +109,7 @@ message TConfigItem { MeteringConfigItem = 45; HiveConfigItem = 46; DataShardConfigItem = 49; - YandexQueryConfigItem = 50; + FederatedQueryConfigItem = 50; PDiskKeyConfigItem = 51; CompactionConfigItem = 52; HttpProxyConfigItem = 53; diff --git a/ydb/core/testlib/test_client.cpp b/ydb/core/testlib/test_client.cpp index 1072532178..3a3980fa19 100644 --- a/ydb/core/testlib/test_client.cpp +++ b/ydb/core/testlib/test_client.cpp @@ -748,7 +748,7 @@ namespace Tests { { auto& controlPlaneStorageConfig = *protoConfig.MutableControlPlaneStorage(); controlPlaneStorageConfig.SetEnabled(true); - controlPlaneStorageConfig.SetUseInMemory(Settings->AppConfig.GetYandexQueryConfig().GetControlPlaneStorage().GetUseInMemory()); + controlPlaneStorageConfig.SetUseInMemory(Settings->AppConfig.GetFederatedQueryConfig().GetControlPlaneStorage().GetUseInMemory()); auto& storage = *controlPlaneStorageConfig.MutableStorage(); storage.SetEndpoint(endpoint); storage.SetTablePrefix(prefix); diff --git a/ydb/core/yq/libs/actors/nodes_manager.cpp b/ydb/core/yq/libs/actors/nodes_manager.cpp index 435ab810db..daba067dc3 100644 --- a/ydb/core/yq/libs/actors/nodes_manager.cpp +++ b/ydb/core/yq/libs/actors/nodes_manager.cpp @@ -1,5 +1,5 @@ #include "nodes_manager.h" -#include <ydb/core/yq/libs/config/protos/yq_config.pb.h> +#include <ydb/core/yq/libs/config/protos/fq_config.pb.h> #include <library/cpp/actors/core/events.h> #include <library/cpp/actors/core/hfunc.h> diff --git a/ydb/core/yq/libs/actors/pending_fetcher.cpp b/ydb/core/yq/libs/actors/pending_fetcher.cpp index 09ab19fa93..72c57df0d8 100644 --- a/ydb/core/yq/libs/actors/pending_fetcher.cpp +++ b/ydb/core/yq/libs/actors/pending_fetcher.cpp @@ -1,5 +1,5 @@ #include <ydb/core/yq/libs/config/protos/pinger.pb.h> -#include <ydb/core/yq/libs/config/protos/yq_config.pb.h> +#include <ydb/core/yq/libs/config/protos/fq_config.pb.h> #include "proxy.h" #include "nodes_manager.h" diff --git a/ydb/core/yq/libs/actors/proxy_private.cpp b/ydb/core/yq/libs/actors/proxy_private.cpp index 38173b8335..144f345994 100644 --- a/ydb/core/yq/libs/actors/proxy_private.cpp +++ b/ydb/core/yq/libs/actors/proxy_private.cpp @@ -1,5 +1,5 @@ #include "proxy_private.h" -#include <ydb/core/yq/libs/config/protos/yq_config.pb.h> +#include <ydb/core/yq/libs/config/protos/fq_config.pb.h> #include <ydb/core/yq/libs/events/events.h> #include <ydb/core/yq/libs/shared_resources/db_pool.h> diff --git a/ydb/core/yq/libs/actors/result_writer.cpp b/ydb/core/yq/libs/actors/result_writer.cpp index d76f37c39a..d68e2b7f22 100644 --- a/ydb/core/yq/libs/actors/result_writer.cpp +++ b/ydb/core/yq/libs/actors/result_writer.cpp @@ -1,4 +1,4 @@ -#include <ydb/core/yq/libs/config/protos/yq_config.pb.h> +#include <ydb/core/yq/libs/config/protos/fq_config.pb.h> #include "proxy.h" #include <ydb/core/protos/services.pb.h> diff --git a/ydb/core/yq/libs/actors/run_actor_params.h b/ydb/core/yq/libs/actors/run_actor_params.h index f5faf21c88..a4da0189bb 100644 --- a/ydb/core/yq/libs/actors/run_actor_params.h +++ b/ydb/core/yq/libs/actors/run_actor_params.h @@ -1,7 +1,7 @@ #pragma once #include <ydb/core/yq/libs/config/protos/common.pb.h> #include <ydb/core/yq/libs/config/protos/pinger.pb.h> -#include <ydb/core/yq/libs/config/protos/yq_config.pb.h> +#include <ydb/core/yq/libs/config/protos/fq_config.pb.h> #include <ydb/core/yq/libs/events/events.h> #include <ydb/core/yq/libs/shared_resources/shared_resources.h> diff --git a/ydb/core/yq/libs/actors/task_get.cpp b/ydb/core/yq/libs/actors/task_get.cpp index 8cb0170afe..c4eec33e2f 100644 --- a/ydb/core/yq/libs/actors/task_get.cpp +++ b/ydb/core/yq/libs/actors/task_get.cpp @@ -1,4 +1,4 @@ -#include <ydb/core/yq/libs/config/protos/yq_config.pb.h> +#include <ydb/core/yq/libs/config/protos/fq_config.pb.h> #include "proxy_private.h" #include "proxy.h" diff --git a/ydb/core/yq/libs/config/protos/CMakeLists.txt b/ydb/core/yq/libs/config/protos/CMakeLists.txt index c399db4b32..cf54066ffd 100644 --- a/ydb/core/yq/libs/config/protos/CMakeLists.txt +++ b/ydb/core/yq/libs/config/protos/CMakeLists.txt @@ -24,6 +24,7 @@ target_proto_messages(libs-config-protos PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/yq/libs/config/protos/control_plane_proxy.proto ${CMAKE_SOURCE_DIR}/ydb/core/yq/libs/config/protos/control_plane_storage.proto ${CMAKE_SOURCE_DIR}/ydb/core/yq/libs/config/protos/db_pool.proto + ${CMAKE_SOURCE_DIR}/ydb/core/yq/libs/config/protos/fq_config.proto ${CMAKE_SOURCE_DIR}/ydb/core/yq/libs/config/protos/gateways.proto ${CMAKE_SOURCE_DIR}/ydb/core/yq/libs/config/protos/health_config.proto ${CMAKE_SOURCE_DIR}/ydb/core/yq/libs/config/protos/issue_id.proto @@ -39,7 +40,6 @@ target_proto_messages(libs-config-protos PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/yq/libs/config/protos/storage.proto ${CMAKE_SOURCE_DIR}/ydb/core/yq/libs/config/protos/test_connection.proto ${CMAKE_SOURCE_DIR}/ydb/core/yq/libs/config/protos/token_accessor.proto - ${CMAKE_SOURCE_DIR}/ydb/core/yq/libs/config/protos/yq_config.proto ) target_proto_addincls(libs-config-protos ./ diff --git a/ydb/core/yq/libs/config/protos/yq_config.proto b/ydb/core/yq/libs/config/protos/fq_config.proto index c7c7deb102..c7c7deb102 100644 --- a/ydb/core/yq/libs/config/protos/yq_config.proto +++ b/ydb/core/yq/libs/config/protos/fq_config.proto diff --git a/ydb/core/yq/libs/shared_resources/db_pool.h b/ydb/core/yq/libs/shared_resources/db_pool.h index e7e28b81a2..b474530375 100644 --- a/ydb/core/yq/libs/shared_resources/db_pool.h +++ b/ydb/core/yq/libs/shared_resources/db_pool.h @@ -1,6 +1,6 @@ #pragma once -#include <ydb/core/yq/libs/config/protos/yq_config.pb.h> +#include <ydb/core/yq/libs/config/protos/fq_config.pb.h> #include <ydb/public/sdk/cpp/client/ydb_table/table.h> #include <ydb/core/yq/libs/events/events.h> diff --git a/ydb/core/yq/libs/shared_resources/shared_resources.h b/ydb/core/yq/libs/shared_resources/shared_resources.h index 738396f5e3..f1c2b5efb6 100644 --- a/ydb/core/yq/libs/shared_resources/shared_resources.h +++ b/ydb/core/yq/libs/shared_resources/shared_resources.h @@ -2,7 +2,7 @@ #include "db_pool.h" #include <ydb/public/sdk/cpp/client/ydb_driver/driver.h> -#include <ydb/core/yq/libs/config/protos/yq_config.pb.h> +#include <ydb/core/yq/libs/config/protos/fq_config.pb.h> #include <ydb/core/yq/libs/shared_resources/interface/shared_resources.h> #include <ydb/library/security/ydb_credentials_provider_factory.h> diff --git a/ydb/public/tools/lib/cmds/__init__.py b/ydb/public/tools/lib/cmds/__init__.py index a7ad4915d1..b6c27419e0 100644 --- a/ydb/public/tools/lib/cmds/__init__.py +++ b/ydb/public/tools/lib/cmds/__init__.py @@ -25,7 +25,7 @@ class EmptyArguments(object): self.use_packages = None self.suppress_version_check = False self.ydb_udfs_dir = None - self.yq_config_path = None + self.fq_config_path = None self.auth_config_path = None self.debug_logging = [] self.fixed_ports = False @@ -297,7 +297,7 @@ def deploy(arguments): additional_log_configs=additional_log_configs, port_allocator=port_allocator, use_in_memory_pdisks=use_in_memory_pdisks_flag(), - yq_config_path=arguments.yq_config_path, + fq_config_path=arguments.fq_config_path, public_http_config_path=arguments.public_http_config_path, auth_config_path=arguments.auth_config_path, **optionals diff --git a/ydb/tests/library/harness/kikimr_config.py b/ydb/tests/library/harness/kikimr_config.py index 7ff6e823ca..24f66bc471 100644 --- a/ydb/tests/library/harness/kikimr_config.py +++ b/ydb/tests/library/harness/kikimr_config.py @@ -127,7 +127,7 @@ class KikimrConfigGenerator(object): enable_pqcd=True, enable_metering=False, grpc_tls_data_path=None, - yq_config_path=None, + fq_config_path=None, public_http_config_path=None, public_http_config=None, enable_datastreams=False, @@ -270,8 +270,8 @@ class KikimrConfigGenerator(object): if auth_config_path: self.yaml_config["auth_config"] = _load_yaml_config(auth_config_path) - if yq_config_path: - self.yaml_config["yandex_query_config"] = _load_yaml_config(yq_config_path) + if fq_config_path: + self.yaml_config["yandex_query_config"] = _load_yaml_config(fq_config_path) # TODO: rename to federated_query_config after migration if public_http_config: self.yaml_config["public_http_config"] = public_http_config |