Add block for V1 API when V2 is enabled (#30863)

Author: mregrock

ydb/core/grpc_services/rpc_dynamic_config.cpp

@@ -1,10 +1,13 @@
 #include "service_dynamic_config.h"
 #include "rpc_deferrable.h"
 
+#include <type_traits>
+
 #include <ydb/core/grpc_services/base/base.h>
 #include <ydb/core/base/appdata.h>
 #include <ydb/core/base/tablet_pipe.h>
 #include <ydb/core/cms/console/console.h>
+#include <ydb/core/blobstorage/base/blobstorage_events.h>
 #include <ydb/public/api/protos/draft/ydb_dynamic_config.pb.h>
 
 namespace NKikimr::NGRpcService {
@@ -66,6 +69,32 @@ class TDynamicConfigRPC : public TRpcOperationRequestActor<TDynamicConfigRPC<TRe
  {
  TBase::Bootstrap(TActivationContext::AsActorContext());
 
+ if constexpr (std::is_same_v<TRequest, TEvSetConfigRequest> || std::is_same_v<TRequest, TEvReplaceConfigRequest>) {
+ if (AppData()->FeatureFlags.GetSwitchToConfigV2()) {
+ NYql::TIssues issues;
+ issues.AddIssue("Dynamic Config V1 is disabled. Use V2 API.");
+ TBase::Reply(Ydb::StatusIds::BAD_REQUEST, issues, TActivationContext::AsActorContext());
+ return;
+ }
+
+ this->Send(MakeBlobStorageNodeWardenID(IActor::SelfId().NodeId()), new TEvNodeWardenQueryStorageConfig(false));
+ this->Become(&TThis::StateWaitNodeWarden);
+ } else {
+ StartConsolePipe();
+ }
+ }
+
+ void Handle(TEvNodeWardenStorageConfig::TPtr& ev) {
+ if (ev->Get()->SelfManagementEnabled) {
+ NYql::TIssues issues;
+ issues.AddIssue("Dynamic Config V1 is disabled. Use V2 API.");
+ TBase::Reply(Ydb::StatusIds::BAD_REQUEST, issues, TActivationContext::AsActorContext());
+ } else {
+ StartConsolePipe();
+ }
+ }
+
+ void StartConsolePipe() {
  NTabletPipe::TClientConfig pipeConfig;
  pipeConfig.RetryPolicy = {
  .RetryLimitCount = 10,
@@ -78,6 +107,13 @@ class TDynamicConfigRPC : public TRpcOperationRequestActor<TDynamicConfigRPC<TRe
  this->Become(&TThis::StateWork);
  }
 
+ STFUNC(StateWaitNodeWarden) {
+ switch (ev->GetTypeRewrite()) {
+ hFunc(TEvNodeWardenStorageConfig, Handle);
+ default: TBase::StateFuncBase(ev);
+ }
+ }
+
 private:
  void PassAway()
  {

ydb/services/config/bsconfig_ut.cpp

@@ -8,6 +8,8 @@
 #include <ydb/core/tx/scheme_cache/scheme_cache.h>
 
 #include <ydb/public/api/grpc/ydb_scheme_v1.grpc.pb.h>
+#include <ydb/public/api/grpc/draft/ydb_dynamic_config_v1.grpc.pb.h>
+#include <ydb/services/dynamic_config/grpc_service.h>
 
 #include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/resources/ydb_resources.h>
 
@@ -20,6 +22,7 @@
 #include <grpcpp/create_channel.h>
 
 #include <util/string/builder.h>
+#include <util/system/thread.h>
 
 #include <functional>
 
@@ -70,7 +73,9 @@ class TBasicKikimrWithGrpcAndRootSchema {
  }
  ServerSettings->Formats = new NKikimr::TFormatFactory;
  ServerSettings->FeatureFlags = appConfig.GetFeatureFlags();
+ ServerSettings->SetEnableFeatureFlagsConfigurator(true);
  ServerSettings->RegisterGrpcService<NKikimr::NGRpcService::TConfigGRpcService>("bsconfig");
+ ServerSettings->RegisterGrpcService<NKikimr::NGRpcService::TGRpcDynamicConfigService>("dynconfig", std::nullopt, true);
 
  Server_.Reset(new NKikimr::Tests::TServer(*ServerSettings));
  Tenants_.Reset(new NKikimr::Tests::TTenants(Server_));
@@ -83,7 +88,7 @@ class TBasicKikimrWithGrpcAndRootSchema {
  //Server_->GetRuntime()->SetLogPriority(NKikimrServices::TX_PROXY, NActors::NLog::PRI_DEBUG);
  Server_->GetRuntime()->SetLogPriority(NKikimrServices::GRPC_SERVER, NActors::NLog::PRI_DEBUG);
  Server_->GetRuntime()->SetLogPriority(NKikimrServices::GRPC_PROXY, NActors::NLog::PRI_DEBUG);
- Server_->GetRuntime()->SetLogPriority(NKikimrServices::BSCONFIG, NActors::NLog::PRI_DEBUG);
+ Server_->GetRuntime()->SetLogPriority(NKikimrServices::BS_CONTROLLER, NActors::NLog::PRI_DEBUG);
  Server_->GetRuntime()->SetLogPriority(NKikimrServices::BOOTSTRAPPER, NActors::NLog::PRI_DEBUG);
  //Server_->GetRuntime()->SetLogPriority(NKikimrServices::STATESTORAGE, NActors::NLog::PRI_DEBUG);
  //Server_->GetRuntime()->SetLogPriority(NKikimrServices::TABLET_EXECUTOR, NActors::NLog::PRI_DEBUG);
@@ -340,6 +345,71 @@ selector_config: []
  UNIT_ASSERT(!yamlConfigFetched);
  UNIT_ASSERT(!storageYamlConfigFetched);
  }
+
+ Y_UNIT_TEST(CheckV1IsBlocked) {
+ TKikimrWithGrpcAndRootSchema server;
+ TString yamlConfig = R"(
+metadata:
+ kind: MainConfig
+ cluster: ""
+ version: 0
+
+config:
+ host_configs:
+ - host_config_id: 1
+ drive:
+ - path: SectorMap:1:64
+ type: SSD
+ - path: SectorMap:2:64
+ type: SSD
+ - host_config_id: 2
+ drive:
+ - path: SectorMap:3:64
+ type: SSD
+ hosts:
+ - host: ::1
+ port: 12001
+ host_config_id: 2
+ feature_flags:
+ switch_to_config_v2: true
+)";
+ ReplaceConfig(server.GetChannel(), yamlConfig, std::nullopt, std::nullopt, false,
+ [](const auto& resp) {
+ UNIT_ASSERT_CHECK_STATUS(resp.operation(), Ydb::StatusIds::SUCCESS);
+ });
+ std::optional<TString> yamlConfigFetched, storageYamlConfigFetched;
+ FetchConfig(server.GetChannel(), false, false, yamlConfigFetched, storageYamlConfigFetched);
+ UNIT_ASSERT(yamlConfigFetched);
+ UNIT_ASSERT(!storageYamlConfigFetched);
+ UNIT_ASSERT_VALUES_EQUAL(yamlConfig, *yamlConfigFetched);
+
+ auto* runtime = server.GetRuntime();
+ bool switchToConfigV2 = false;
+ for (int i = 0; i < 10; ++i) {
+ auto& appData = runtime->GetAppData(0);
+ if (appData.FeatureFlags.GetSwitchToConfigV2()) {
+ switchToConfigV2 = true;
+ break;
+ }
+ Sleep(TDuration::MilliSeconds(100));
+ }
+ UNIT_ASSERT(switchToConfigV2);
+
+ std::unique_ptr<Ydb::DynamicConfig::V1::DynamicConfigService::Stub> stub;
+ stub = Ydb::DynamicConfig::V1::DynamicConfigService::NewStub(server.GetChannel());
+
+ Ydb::DynamicConfig::ReplaceConfigRequest request;
+ request.set_config(yamlConfig);
+
+ Ydb::DynamicConfig::ReplaceConfigResponse response;
+ grpc::ClientContext context;
+ AdjustCtxForDB(context);
+
+ stub->ReplaceConfig(&context, request, &response);
+
+ UNIT_ASSERT_CHECK_STATUS(response.operation(), Ydb::StatusIds::BAD_REQUEST);
+ UNIT_ASSERT_STRING_CONTAINS(response.operation().issues(0).message(), "Dynamic Config V1 is disabled. Use V2 API.");
+ }
 }
 
 } // NKikimr::NGRpcService

ydb/tests/functional/config/test_distconf.py

@@ -11,6 +11,7 @@
 from ydb.tests.library.common.types import Erasure
 import ydb.tests.library.common.cms as cms
 from ydb.tests.library.clients.kikimr_http_client import SwaggerClient
+from ydb.tests.library.clients.kikimr_dynconfig_client import DynConfigClient
 from ydb.tests.library.harness.kikimr_runner import KiKiMR
 from ydb.tests.library.harness.kikimr_config import KikimrConfigGenerator
 from ydb.tests.library.kv.helpers import create_kv_tablets_and_wait_for_start
@@ -95,7 +96,9 @@ def setup_class(cls):
  if not cls.protected_mode:
  cms.request_increase_ratio_limit(cls.cluster.client)
  host = cls.cluster.nodes[1].host
+ grpc_port = cls.cluster.nodes[1].grpc_port
  cls.swagger_client = SwaggerClient(host, cls.cluster.nodes[1].mon_port)
+ cls.dynconfig_client = DynConfigClient(host, grpc_port)
 
  @classmethod
  def teardown_class(cls):
@@ -415,6 +418,13 @@ def test_invalid_change_host_config_disk(self):
  logger.debug(f"replace_config_response: {replace_config_response}")
  assert_that(replace_config_response.operation.status == StatusIds.INTERNAL_ERROR)
 
+ def test_v1_blocked_when_v2_is_enabled(self):
+ fetched_config = fetch_config(self.cluster.config_client)
+ replace_config_response = self.dynconfig_client.replace_config(fetched_config)
+ assert_that(replace_config_response.operation.status == StatusIds.BAD_REQUEST)
+ assert_that(replace_config_response.operation.issues[0].message == "Dynamic Config V1 is disabled. Use V2 API.")
+ logger.debug(replace_config_response.operation)
+
 
 class TestDistConfBootstrapValidation:
 

ydb/tests/library/clients/kikimr_dynconfig_client.py

@@ -65,6 +65,11 @@ def fetch_config(self):
  request = dynamic_config_api.GetConfigRequest()
  return self.invoke(request, 'GetConfig')
 
+ def replace_config(self, config):
+ request = dynamic_config_api.ReplaceConfigRequest()
+ request.config = config
+ return self.invoke(request, 'ReplaceConfig')
+
  def get_configuration_version(self, list_nodes=False):
  request = dynamic_config_api.GetConfigurationVersionRequest(
  list_nodes=list_nodes