Merge 845103f into ffa5093

alexvru · web-flow · commit 9f5b3d77fe03 · 2024-12-05T09:43:16.000Z
diff --git a/ydb/core/grpc_services/rpc_bsconfig.cpp b/ydb/core/grpc_services/rpc_bsconfig.cpp
@@ -7,6 +7,7 @@
 #include <ydb/core/grpc_services/rpc_common/rpc_common.h>
 #include <ydb/core/mind/local.h>
 #include <ydb/core/protos/local.pb.h>
+#include <ydb/core/blobstorage/nodewarden/node_warden_events.h>
 
 namespace NKikimr::NGRpcService {
 
@@ -16,6 +17,9 @@ using TEvReplaceStorageConfigRequest =
 using TEvFetchStorageConfigRequest =
     TGrpcRequestOperationCall<Ydb::BSConfig::FetchStorageConfigRequest,
         Ydb::BSConfig::FetchStorageConfigResponse>;
+using TEvBootstrapRequest =
+    TGrpcRequestOperationCall<Ydb::BSConfig::BootstrapRequest,
+        Ydb::BSConfig::BootstrapResponse>;
 
 using namespace NActors;
 using namespace Ydb;
@@ -112,5 +116,52 @@ void DoFetchBSConfig(std::unique_ptr<IRequestOpCtx> p, const IFacilityProvider&)
     TActivationContext::AsActorContext().Register(new TFetchStorageConfigRequest(p.release()));
 }
 
+void DoBootstrap(std::unique_ptr<IRequestOpCtx> p, const IFacilityProvider&) {
+    class TBootstrapRequest : public TRpcOperationRequestActor<TBootstrapRequest, TEvBootstrapRequest> {
+        using TBase = TRpcOperationRequestActor<TBootstrapRequest, TEvBootstrapRequest>;
 
-} // namespace NKikimr::NGRpcService
+    public:
+        using TBase::TBase;
+
+        void Bootstrap(const TActorContext &ctx) {
+            TBase::Bootstrap(ctx);
+            Become(&TBootstrapRequest::StateFunc);
+
+            const auto& request = *GetProtoRequest();
+
+            auto ev = std::make_unique<NStorage::TEvNodeConfigInvokeOnRoot>();
+            auto& record = ev->Record;
+            auto *cmd = record.MutableBootstrap();
+            cmd->SetSelfAssemblyUUID(request.self_assembly_uuid());
+            Send(MakeBlobStorageNodeWardenID(SelfId().NodeId()), ev.release());
+        }
+
+        void Handle(NStorage::TEvNodeConfigInvokeOnRootResult::TPtr ev) {
+            auto& record = ev->Get()->Record;
+            switch (record.GetStatus()) {
+                case NKikimrBlobStorage::TEvNodeConfigInvokeOnRootResult::OK:
+                    ReplyWithResult(Ydb::StatusIds::SUCCESS, TActivationContext::AsActorContext());
+                    break;
+
+                default:
+                    Reply(Ydb::StatusIds::GENERIC_ERROR, record.GetErrorReason(), NKikimrIssues::TIssuesIds::DEFAULT_ERROR,
+                        TActivationContext::AsActorContext());
+                    break;
+            }
+        }
+
+    protected:
+        STFUNC(StateFunc) {
+            switch (ev->GetTypeRewrite()) {
+                hFunc(NStorage::TEvNodeConfigInvokeOnRootResult, Handle);
+
+                default:
+                    return TBase::StateFuncBase(ev);
+            }
+        }
+    };
+
+    TActivationContext::AsActorContext().Register(new TBootstrapRequest(p.release()));
+}
+
+} // namespace NKikimr::NGRpcService
diff --git a/ydb/core/grpc_services/service_bsconfig.h b/ydb/core/grpc_services/service_bsconfig.h
@@ -11,4 +11,6 @@ namespace NKikimr::NGRpcService {
 
     void DoFetchBSConfig(std::unique_ptr<IRequestOpCtx> p, const IFacilityProvider&);
 
-} // NKikimr::NGRpcService
+    void DoBootstrap(std::unique_ptr<IRequestOpCtx> p, const IFacilityProvider&);
+
+} // NKikimr::NGRpcService
diff --git a/ydb/core/jaeger_tracing/request_discriminator.h b/ydb/core/jaeger_tracing/request_discriminator.h
@@ -70,6 +70,7 @@ enum class ERequestType: size_t {
 
     BSCONFIG_REPLACESTORAGECONFIG,
     BSCONFIG_FETCHSTORAGECONFIG,
+    BSCONFIG_BOOTSTRAP,
 
     PING_GRPC,
     PING_PROXY,
@@ -141,6 +142,7 @@ static const THashMap<TStringBuf, ERequestType> NameToRequestType = {
 
     {"BSConfig.ReplaceStorageConfig", ERequestType::BSCONFIG_REPLACESTORAGECONFIG},
     {"BSConfig.FetchStorageConfig", ERequestType::BSCONFIG_FETCHSTORAGECONFIG},
+    {"BSConfig.Bootstrap", ERequestType::BSCONFIG_BOOTSTRAP},
 };
 
 struct TRequestDiscriminator {
diff --git a/ydb/public/api/grpc/ydb_bsconfig_v1.proto b/ydb/public/api/grpc/ydb_bsconfig_v1.proto
@@ -10,10 +10,13 @@ import "ydb/public/api/protos/ydb_bsconfig.proto";
 
 service BSConfigService {
 
-    // Initialize Blobstorage host configs and box
+    // Initialize Blobstorage/single config
     rpc ReplaceStorageConfig(BSConfig.ReplaceStorageConfigRequest) returns (BSConfig.ReplaceStorageConfigResponse);
 
-    // Fetch Blobstorage host configs and box
+    // Fetch Blobstorage/single config
     rpc FetchStorageConfig(BSConfig.FetchStorageConfigRequest) returns (BSConfig.FetchStorageConfigResponse);
 
-}
+    // Bootstrap automatically configured cluster
+    rpc Bootstrap(BSConfig.BootstrapRequest) returns (BSConfig.BootstrapResponse);
+
+}
diff --git a/ydb/public/api/protos/ydb_bsconfig.proto b/ydb/public/api/protos/ydb_bsconfig.proto
@@ -35,4 +35,13 @@ message FetchStorageConfigResponse {
 
 message FetchStorageConfigResult {
     string yaml_config = 1;
-}
+}
+
+message BootstrapRequest {
+    Ydb.Operations.OperationParams operation_params = 1;
+    string self_assembly_uuid = 2;
+}
+
+message BootstrapResponse {
+    Ydb.Operations.Operation operation = 1;
+}
diff --git a/ydb/public/lib/ydb_cli/commands/ya.make b/ydb/public/lib/ydb_cli/commands/ya.make
@@ -9,6 +9,7 @@ SRCS(
     query_workload.cpp
     ydb_admin.cpp
     ydb_benchmark.cpp
+    ydb_cluster.cpp
     ydb_debug.cpp
     ydb_dynamic_config.cpp
     ydb_ping.cpp
diff --git a/ydb/public/lib/ydb_cli/commands/ydb_admin.cpp b/ydb/public/lib/ydb_cli/commands/ydb_admin.cpp
@@ -1,6 +1,7 @@
 #include "ydb_admin.h"
 
 #include "ydb_dynamic_config.h"
+#include "ydb_cluster.h"
 
 namespace NYdb {
 namespace NConsoleClient {
@@ -10,6 +11,7 @@ TCommandAdmin::TCommandAdmin()
 {
     AddCommand(std::make_unique<NDynamicConfig::TCommandConfig>());
     AddCommand(std::make_unique<NDynamicConfig::TCommandVolatileConfig>());
+    AddCommand(std::make_unique<NCluster::TCommandCluster>());
 }
 
 }
diff --git a/ydb/public/lib/ydb_cli/commands/ydb_cluster.cpp b/ydb/public/lib/ydb_cli/commands/ydb_cluster.cpp
@@ -0,0 +1,38 @@
+#include "ydb_cluster.h"
+
+#include <ydb/public/sdk/cpp/client/ydb_bsconfig/bsconfig.h>
+
+using namespace NKikimr;
+
+namespace NYdb::NConsoleClient::NCluster {
+
+TCommandCluster::TCommandCluster()
+    : TClientCommandTree("cluster", {}, "Cluster-wide administration")
+{
+    AddCommand(std::make_unique<TCommandClusterBootstrap>());
+}
+
+TCommandClusterBootstrap::TCommandClusterBootstrap()
+    : TYdbCommand("bootstrap", {}, "Bootstrap automatically-assembled cluster")
+{}
+
+void TCommandClusterBootstrap::Config(TConfig& config) {
+    TYdbCommand::Config(config);
+    config.Opts->AddLongOption("guid", "Self-assembly UUID")
+        .RequiredArgument("STRING").StoreResult(&SelfAssemblyUUID);
+    config.SetFreeArgsNum(0);
+}
+
+void TCommandClusterBootstrap::Parse(TConfig& config) {
+    TClientCommand::Parse(config);
+}
+
+int TCommandClusterBootstrap::Run(TConfig& config) {
+    auto driver = std::make_unique<NYdb::TDriver>(CreateDriver(config));
+    auto client = NYdb::NBsConfig::TClient(*driver);
+    auto result = client.Bootstrap(SelfAssemblyUUID).GetValueSync();
+    ThrowOnError(result);
+    return EXIT_SUCCESS;
+}
+
+} // namespace NYdb::NConsoleClient::NCluster
diff --git a/ydb/public/lib/ydb_cli/commands/ydb_cluster.h b/ydb/public/lib/ydb_cli/commands/ydb_cluster.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "ydb_command.h"
+#include "ydb_common.h"
+
+#include <util/generic/set.h>
+
+namespace NYdb::NConsoleClient::NCluster {
+
+class TCommandCluster : public TClientCommandTree {
+public:
+    TCommandCluster();
+};
+
+class TCommandClusterBootstrap : public TYdbCommand {
+    TString SelfAssemblyUUID;
+
+public:
+    TCommandClusterBootstrap();
+    void Config(TConfig& config) override;
+    void Parse(TConfig& config) override;
+    int Run(TConfig& config) override;
+};
+
+} // namespace NYdb::NConsoleClient::NCluster
diff --git a/ydb/public/sdk/cpp/client/ydb_bsconfig/bsconfig.cpp b/ydb/public/sdk/cpp/client/ydb_bsconfig/bsconfig.cpp
@@ -0,0 +1,36 @@
+#include "bsconfig.h"
+
+#include <ydb/public/api/grpc/ydb_bsconfig_v1.grpc.pb.h>
+#include <ydb/public/sdk/cpp/client/ydb_common_client/impl/client.h>
+#include <ydb/public/sdk/cpp/client/impl/ydb_internal/make_request/make.h>
+
+namespace NYdb::NBsConfig {
+
+class TClient::TImpl : public TClientImplCommon<TClient::TImpl> {
+public:
+    TImpl(std::shared_ptr<TGRpcConnectionsImpl>&& connections, const TCommonClientSettings& settings)
+        : TClientImplCommon(std::move(connections), settings)
+    {}
+
+    TAsyncStatus Bootstrap(const TString& selfAssemblyUUID, const TBsConfigSettings& settings) {
+        auto request = MakeOperationRequest<Ydb::BSConfig::BootstrapRequest>(settings);
+        request.set_self_assembly_uuid(selfAssemblyUUID);
+
+        return RunSimple<Ydb::BSConfig::V1::BSConfigService, Ydb::BSConfig::BootstrapRequest, Ydb::BSConfig::BootstrapResponse>(
+            std::move(request),
+            &Ydb::BSConfig::V1::BSConfigService::Stub::AsyncBootstrap,
+            TRpcRequestSettings::Make(settings));
+    }
+};
+
+TClient::TClient(const TDriver& driver, const TCommonClientSettings& settings)
+    : Impl_(new TImpl(CreateInternalInterface(driver), settings))
+{}
+
+TClient::~TClient() = default;
+
+TAsyncStatus TClient::Bootstrap(const TString& selfAssemblyUUID, const TBsConfigSettings& settings) {
+    return Impl_->Bootstrap(selfAssemblyUUID, settings);
+}
+
+} // NYdb::NBsConfig
diff --git a/ydb/public/sdk/cpp/client/ydb_bsconfig/bsconfig.h b/ydb/public/sdk/cpp/client/ydb_bsconfig/bsconfig.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include <ydb/public/sdk/cpp/client/ydb_driver/driver.h>
+
+namespace NYdb::NBsConfig {
+
+    struct TBsConfigSettings : public NYdb::TOperationRequestSettings<TBsConfigSettings> {};
+
+    class TClient {
+        class TImpl;
+        std::unique_ptr<TImpl> Impl_;
+
+    public:
+        explicit TClient(const TDriver& driver, const TCommonClientSettings& settings = {});
+        ~TClient();
+        TAsyncStatus Bootstrap(const TString& selfAssemblyUUID, const TBsConfigSettings& settings = {});
+    };
+
+} // NYdb::NBsConfig
diff --git a/ydb/public/sdk/cpp/client/ydb_bsconfig/ya.make b/ydb/public/sdk/cpp/client/ydb_bsconfig/ya.make
@@ -0,0 +1,18 @@
+LIBRARY()
+
+SRCS(
+    bsconfig.cpp
+)
+
+PEERDIR(
+    ydb/public/api/grpc
+    ydb/public/sdk/cpp/client/impl/ydb_internal/make_request
+    ydb/public/sdk/cpp/client/ydb_common_client
+    ydb/public/sdk/cpp/client/ydb_common_client/impl
+    ydb/public/sdk/cpp/client/ydb_driver
+    ydb/public/sdk/cpp/client/ydb_proto
+    ydb/public/sdk/cpp/client/ydb_types
+    ydb/public/sdk/cpp/client/ydb_types/status
+)
+
+END()
diff --git a/ydb/public/sdk/cpp/ya.make b/ydb/public/sdk/cpp/ya.make
@@ -15,6 +15,7 @@ RECURSE(
     client/impl/ydb_internal/value_helpers
     client/impl/ydb_stats
     client/resources
+    client/ydb_bsconfig
     client/ydb_common_client
     client/ydb_common_client/impl
     client/ydb_coordination
diff --git a/ydb/services/bsconfig/grpc_service.cpp b/ydb/services/bsconfig/grpc_service.cpp
@@ -30,8 +30,9 @@ void TBSConfigGRpcService::SetupIncomingRequests(NYdbGrpc::TLoggerPtr logger) {
 
     SETUP_BS_METHOD(ReplaceStorageConfig, DoReplaceBSConfig, Rps, BSCONFIG_REPLACESTORAGECONFIG);
     SETUP_BS_METHOD(FetchStorageConfig, DoFetchBSConfig, Rps, BSCONFIG_FETCHSTORAGECONFIG);
+    SETUP_BS_METHOD(Bootstrap, DoBootstrap, Rps, BSCONFIG_BOOTSTRAP);
 
     #undef SETUP_BS_METHOD
 }
 
-} // namespace NKikimr::NGRpcService
+} // namespace NKikimr::NGRpcService

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`#include "ydb_admin.h"`
`2`	`2`
`3`	`3`	`#include "ydb_dynamic_config.h"`
	`4`	`+#include "ydb_cluster.h"`
`4`	`5`
`5`	`6`	`namespace NYdb {`
`6`	`7`	`namespace NConsoleClient {`
`@@ -10,6 +11,7 @@ TCommandAdmin::TCommandAdmin()`
`10`	`11`	`{`
`11`	`12`	`AddCommand(std::make_unique<NDynamicConfig::TCommandConfig>());`
`12`	`13`	`AddCommand(std::make_unique<NDynamicConfig::TCommandVolatileConfig>());`
	`14`	`+ AddCommand(std::make_unique<NCluster::TCommandCluster>());`
`13`	`15`	`}`
`14`	`16`
`15`	`17`	`}`