[NBS] Allow custom BlockDigestGenerator for volumes

cloud/blockstore/libs/daemon/ydb/bootstrap.cpp

@@ -45,6 +45,7 @@
 #include <cloud/blockstore/libs/service_local/storage_null.h>
 #include <cloud/blockstore/libs/spdk/iface/env.h>
 #include <cloud/blockstore/libs/spdk/iface/env_stub.h>
+#include <cloud/blockstore/libs/storage/core/block_digest_factory.h>
 #include <cloud/blockstore/libs/storage/core/manually_preempted_volumes.h>
 #include <cloud/blockstore/libs/storage/core/partition_budget_manager.h>
 #include <cloud/blockstore/libs/storage/core/probes.h>
@@ -774,16 +775,10 @@ void TBootstrapYdb::InitKikimrService()
 
     STORAGE_INFO("StatsFetcher initialized");
 
-    if (Configs->StorageConfig->GetBlockDigestsEnabled()) {
-        if (Configs->StorageConfig->GetUseTestBlockDigestGenerator()) {
-            BlockDigestGenerator = CreateTestBlockDigestGenerator();
-        } else {
-            BlockDigestGenerator = CreateExt4BlockDigestGenerator(
-                Configs->StorageConfig->GetDigestedBlocksPercentage());
-        }
-    } else {
-        BlockDigestGenerator = CreateBlockDigestGeneratorStub();
-    }
+    BlockDigestGeneratorFactory = NStorage::CreateBlockDigestGeneratorFactory();
+    BlockDigestGenerator =
+        BlockDigestGeneratorFactory->CreateBlockDigestGenerator(
+            *Configs->StorageConfig);
 
     STORAGE_INFO("DigestGenerator initialized");
 
@@ -849,6 +844,7 @@ void TBootstrapYdb::InitKikimrService()
     args.Allocator = Allocator;
     args.LocalStorageProvider = LocalStorageProvider;
     args.ProfileLog = ProfileLog;
+    args.BlockDigestGeneratorFactory = BlockDigestGeneratorFactory;
     args.BlockDigestGenerator = BlockDigestGenerator;
     args.TraceSerializer = TraceSerializer;
     args.LogbrokerService = LogbrokerService;

cloud/blockstore/libs/daemon/ydb/bootstrap.h

@@ -119,6 +119,7 @@ struct TBootstrapYdb final
     ITraceServiceClientPtr TraceServiceClient;
     std::function<void(TLog& log)> SpdkLogInitializer;
     NStorage::TPartitionBudgetManagerPtr PartitionBudgetManager;
+    NStorage::IBlockDigestGeneratorFactoryPtr BlockDigestGeneratorFactory;
 
 public:
     TBootstrapYdb(

cloud/blockstore/libs/diagnostics/block_digest.h

@@ -12,6 +12,8 @@ namespace NCloud::NBlockStore {
 
 struct IBlockDigestGenerator
 {
+    virtual ~IBlockDigestGenerator() = default;
+
     virtual TMaybe<ui32> ComputeDigest(
         ui64 blockIndex,
         TBlockDataRef blockContent) const = 0;

cloud/blockstore/libs/storage/core/block_digest_factory.cpp

@@ -0,0 +1,40 @@
+#include "block_digest_factory.h"
+
+#include "config.h"
+
+#include <cloud/blockstore/libs/diagnostics/block_digest.h>
+
+namespace NCloud::NBlockStore::NStorage {
+
+namespace {
+
+////////////////////////////////////////////////////////////////////////////////
+
+struct TBlockDigestGeneratorFactory final: IBlockDigestGeneratorFactory
+{
+    [[nodiscard]] auto CreateBlockDigestGenerator(const TStorageConfig& config)
+        -> IBlockDigestGeneratorPtr final
+    {
+        if (!config.GetBlockDigestsEnabled()) {
+            return CreateBlockDigestGeneratorStub();
+        }
+
+        if (config.GetUseTestBlockDigestGenerator()) {
+            return CreateTestBlockDigestGenerator();
+        }
+
+        return CreateExt4BlockDigestGenerator(
+            config.GetDigestedBlocksPercentage());
+    }
+};
+
+}   // namespace
+
+////////////////////////////////////////////////////////////////////////////////
+
+IBlockDigestGeneratorFactoryPtr CreateBlockDigestGeneratorFactory()
+{
+    return std::make_shared<TBlockDigestGeneratorFactory>();
+}
+
+}   // namespace NCloud::NBlockStore::NStorage

cloud/blockstore/libs/storage/core/block_digest_factory.h

@@ -0,0 +1,22 @@
+#pragma once
+#include "public.h"
+
+#include <cloud/blockstore/libs/diagnostics/public.h>
+
+namespace NCloud::NBlockStore::NStorage {
+
+////////////////////////////////////////////////////////////////////////////////
+
+struct IBlockDigestGeneratorFactory
+{
+    virtual ~IBlockDigestGeneratorFactory() = default;
+
+    [[nodiscard]] virtual auto CreateBlockDigestGenerator(
+        const TStorageConfig& config) -> IBlockDigestGeneratorPtr = 0;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+
+IBlockDigestGeneratorFactoryPtr CreateBlockDigestGeneratorFactory();
+
+}   // namespace NCloud::NBlockStore::NStorage

cloud/blockstore/libs/storage/core/public.h

@@ -36,6 +36,9 @@ using TManuallyPreemptedVolumesPtr = std::shared_ptr<TManuallyPreemptedVolumes>;
 class TPartitionBudgetManager;
 using TPartitionBudgetManagerPtr = std::shared_ptr<TPartitionBudgetManager>;
 
+struct IBlockDigestGeneratorFactory;
+using IBlockDigestGeneratorFactoryPtr = std::shared_ptr<IBlockDigestGeneratorFactory>;
+
 ////////////////////////////////////////////////////////////////////////////////
 
 enum class EStorageAccessMode

cloud/blockstore/libs/storage/core/ya.make

@@ -4,6 +4,7 @@ GENERATE_ENUM_SERIALIZATION(device_operation_tracker.h)
 GENERATE_ENUM_SERIALIZATION(mount_token.h)
 
 SRCS(
+    block_digest_factory.cpp
     block_handler.cpp
     channel_permissions.cpp
     compaction_map.cpp

cloud/blockstore/libs/storage/init/server/actorsystem.cpp

@@ -225,7 +225,7 @@ class TStorageServicesInitializer final
             Args.StorageConfig,
             Args.DiagnosticsConfig,
             Args.ProfileLog,
-            Args.BlockDigestGenerator,
+            Args.BlockDigestGeneratorFactory,
             Args.DiscoveryService,
             Args.TraceSerializer,
             Args.EndpointEventHandler,
@@ -383,6 +383,7 @@ class TCustomLocalServiceInitializer final
     const TStorageConfigPtr StorageConfig;
     const TDiagnosticsConfigPtr DiagnosticsConfig;
     const IProfileLogPtr ProfileLog;
+    const IBlockDigestGeneratorFactoryPtr BlockDigestGeneratorFactory;
     const IBlockDigestGeneratorPtr BlockDigestGenerator;
     const ITraceSerializerPtr TraceSerializer;
     const NLogbroker::IServicePtr LogbrokerService;
@@ -400,6 +401,7 @@ class TCustomLocalServiceInitializer final
             TStorageConfigPtr storageConfig,
             TDiagnosticsConfigPtr diagnosticsConfig,
             IProfileLogPtr profileLog,
+            IBlockDigestGeneratorFactoryPtr blockDigestGeneratorFactory,
             IBlockDigestGeneratorPtr blockDigestGenerator,
             ITraceSerializerPtr traceSerializer,
             NLogbroker::IServicePtr logbrokerService,
@@ -414,6 +416,7 @@ class TCustomLocalServiceInitializer final
         , StorageConfig(std::move(storageConfig))
         , DiagnosticsConfig(std::move(diagnosticsConfig))
         , ProfileLog(std::move(profileLog))
+        , BlockDigestGeneratorFactory(std::move(blockDigestGeneratorFactory))
         , BlockDigestGenerator(std::move(blockDigestGenerator))
         , TraceSerializer(std::move(traceSerializer))
         , LogbrokerService(std::move(logbrokerService))
@@ -432,7 +435,7 @@ class TCustomLocalServiceInitializer final
         auto storageConfig = StorageConfig;
         auto diagnosticsConfig = DiagnosticsConfig;
         auto profileLog = ProfileLog;
-        auto blockDigestGenerator = BlockDigestGenerator;
+        auto blockDigestGeneratorFactory = BlockDigestGeneratorFactory;
         auto traceSerializer = TraceSerializer;
         auto logbrokerService = LogbrokerService;
         auto notifyService = NotifyService;
@@ -450,7 +453,7 @@ class TCustomLocalServiceInitializer final
                 storageConfig,
                 diagnosticsConfig,
                 profileLog,
-                blockDigestGenerator,
+                blockDigestGeneratorFactory,
                 traceSerializer,
                 rdmaClient,
                 partitionBudgetManager,
@@ -580,6 +583,7 @@ IActorSystemPtr CreateActorSystem(const TServerActorSystemArgs& sArgs)
             sArgs.StorageConfig,
             sArgs.DiagnosticsConfig,
             sArgs.ProfileLog,
+            sArgs.BlockDigestGeneratorFactory,
             sArgs.BlockDigestGenerator,
             sArgs.TraceSerializer,
             sArgs.LogbrokerService,

cloud/blockstore/libs/storage/init/server/actorsystem.h

@@ -56,6 +56,7 @@ struct TServerActorSystemArgs
     IStorageProviderPtr LocalStorageProvider;
     IProfileLogPtr ProfileLog;
     IBlockDigestGeneratorPtr BlockDigestGenerator;
+    IBlockDigestGeneratorFactoryPtr BlockDigestGeneratorFactory;
     ITraceSerializerPtr TraceSerializer;
     NLogbroker::IServicePtr LogbrokerService;
     NNotify::IServicePtr NotifyService;

cloud/blockstore/libs/storage/service/service.cpp

@@ -12,7 +12,7 @@ IActorPtr CreateStorageService(
     TStorageConfigPtr config,
     TDiagnosticsConfigPtr diagnosticsConfig,
     IProfileLogPtr profileLog,
-    IBlockDigestGeneratorPtr blockDigestGenerator,
+    IBlockDigestGeneratorFactoryPtr blockDigestGeneratorFactory,
     NDiscovery::IDiscoveryServicePtr discoveryService,
     ITraceSerializerPtr traceSerializer,
     NServer::IEndpointEventHandlerPtr endpointEventHandler,
@@ -27,7 +27,7 @@ IActorPtr CreateStorageService(
         std::move(config),
         std::move(diagnosticsConfig),
         std::move(profileLog),
-        std::move(blockDigestGenerator),
+        std::move(blockDigestGeneratorFactory),
         std::move(discoveryService),
         std::move(traceSerializer),
         std::move(endpointEventHandler),

cloud/blockstore/libs/storage/service/service.h

@@ -19,7 +19,7 @@ NActors::IActorPtr CreateStorageService(
     TStorageConfigPtr config,
     TDiagnosticsConfigPtr diagnosticsConfig,
     IProfileLogPtr profileLog,
-    IBlockDigestGeneratorPtr blockDigestGenerator,
+    IBlockDigestGeneratorFactoryPtr blockDigestGeneratorFactory,
     NDiscovery::IDiscoveryServicePtr discoveryService,
     ITraceSerializerPtr traceSerializer,
     NServer::IEndpointEventHandlerPtr endpointEventHandler,

cloud/blockstore/libs/storage/service/service_actor.cpp

@@ -20,7 +20,7 @@ TServiceActor::TServiceActor(
         TStorageConfigPtr config,
         TDiagnosticsConfigPtr diagnosticsConfig,
         IProfileLogPtr profileLog,
-        IBlockDigestGeneratorPtr blockDigestGenerator,
+        IBlockDigestGeneratorFactoryPtr blockDigestGeneratorFactory,
         NDiscovery::IDiscoveryServicePtr discoveryService,
         ITraceSerializerPtr traceSerializer,
         NServer::IEndpointEventHandlerPtr endpointEventHandler,
@@ -33,7 +33,7 @@ TServiceActor::TServiceActor(
     : Config(std::move(config))
     , DiagnosticsConfig(std::move(diagnosticsConfig))
     , ProfileLog(std::move(profileLog))
-    , BlockDigestGenerator(std::move(blockDigestGenerator))
+    , BlockDigestGeneratorFactory(std::move(blockDigestGeneratorFactory))
     , DiscoveryService(std::move(discoveryService))
     , TraceSerializer(std::move(traceSerializer))
     , EndpointEventHandler(std::move(endpointEventHandler))

cloud/blockstore/libs/storage/service/service_actor.h

@@ -43,7 +43,7 @@ class TServiceActor final
     const TStorageConfigPtr Config;
     const TDiagnosticsConfigPtr DiagnosticsConfig;
     const IProfileLogPtr ProfileLog;
-    const IBlockDigestGeneratorPtr BlockDigestGenerator;
+    const IBlockDigestGeneratorFactoryPtr BlockDigestGeneratorFactory;
     const NDiscovery::IDiscoveryServicePtr DiscoveryService;
     const ITraceSerializerPtr TraceSerializer;
     const NServer::IEndpointEventHandlerPtr EndpointEventHandler;
@@ -72,7 +72,7 @@ class TServiceActor final
         TStorageConfigPtr config,
         TDiagnosticsConfigPtr diagnosticsConfig,
         IProfileLogPtr profileLog,
-        IBlockDigestGeneratorPtr blockDigestGenerator,
+        IBlockDigestGeneratorFactoryPtr blockDigestGeneratorFactory,
         NDiscovery::IDiscoveryServicePtr discoveryService,
         ITraceSerializerPtr traceSerializer,
         NServer::IEndpointEventHandlerPtr endpointEventHandler,
@@ -496,7 +496,7 @@ NActors::IActorPtr CreateVolumeSessionActor(
     TStorageConfigPtr config,
     TDiagnosticsConfigPtr diagnosticsConfig,
     IProfileLogPtr profileLog,
-    IBlockDigestGeneratorPtr blockDigestGenerator,
+    IBlockDigestGeneratorFactoryPtr blockDigestGeneratorFactory,
     ITraceSerializerPtr traceSerializer,
     NServer::IEndpointEventHandlerPtr endpointEventHandler,
     NCloud::NStorage::NRdma::IClientPtr rdmaClient,

cloud/blockstore/libs/storage/service/service_actor_mount.cpp

@@ -138,7 +138,7 @@ void TServiceActor::HandleMountVolume(
                 Config,
                 DiagnosticsConfig,
                 ProfileLog,
-                BlockDigestGenerator,
+                BlockDigestGeneratorFactory,
                 TraceSerializer,
                 EndpointEventHandler,
                 RdmaClient,

cloud/blockstore/libs/storage/service/volume_session_actor.cpp

@@ -381,7 +381,7 @@ IActorPtr CreateVolumeSessionActor(
     TStorageConfigPtr config,
     TDiagnosticsConfigPtr diagnosticsConfig,
     IProfileLogPtr profileLog,
-    IBlockDigestGeneratorPtr blockDigestGenerator,
+    IBlockDigestGeneratorFactoryPtr blockDigestGeneratorFactory,
     ITraceSerializerPtr traceSerializer,
     NServer::IEndpointEventHandlerPtr endpointEventHandler,
     NCloud::NStorage::NRdma::IClientPtr rdmaClient,
@@ -396,7 +396,7 @@ IActorPtr CreateVolumeSessionActor(
         std::move(config),
         std::move(diagnosticsConfig),
         std::move(profileLog),
-        std::move(blockDigestGenerator),
+        std::move(blockDigestGeneratorFactory),
         std::move(traceSerializer),
         std::move(endpointEventHandler),
         std::move(rdmaClient),
@@ -407,6 +407,4 @@ IActorPtr CreateVolumeSessionActor(
         temporaryServer);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-
 }   // namespace NCloud::NBlockStore::NStorage

cloud/blockstore/libs/storage/service/volume_session_actor.h

@@ -54,7 +54,7 @@ class TVolumeSessionActor final
     const TStorageConfigPtr Config;
     const TDiagnosticsConfigPtr DiagnosticsConfig;
     const IProfileLogPtr ProfileLog;
-    const IBlockDigestGeneratorPtr BlockDigestGenerator;
+    const IBlockDigestGeneratorFactoryPtr BlockDigestGeneratorFactory;
     const ITraceSerializerPtr TraceSerializer;
     const NServer::IEndpointEventHandlerPtr EndpointEventHandler;
     const NCloud::NStorage::NRdma::IClientPtr RdmaClient;
@@ -96,7 +96,7 @@ class TVolumeSessionActor final
         TStorageConfigPtr config,
         TDiagnosticsConfigPtr diagnosticsConfig,
         IProfileLogPtr profileLog,
-        IBlockDigestGeneratorPtr blockDigestGenerator,
+        IBlockDigestGeneratorFactoryPtr blockDigestGeneratorFactory,
         ITraceSerializerPtr traceSerializer,
         NServer::IEndpointEventHandlerPtr endpointEventHandler,
         NCloud::NStorage::NRdma::IClientPtr rdmaClient,
@@ -109,7 +109,7 @@ class TVolumeSessionActor final
         , Config(std::move(config))
         , DiagnosticsConfig(std::move(diagnosticsConfig))
         , ProfileLog(std::move(profileLog))
-        , BlockDigestGenerator(std::move(blockDigestGenerator))
+        , BlockDigestGeneratorFactory(std::move(blockDigestGeneratorFactory))
         , TraceSerializer(std::move(traceSerializer))
         , EndpointEventHandler(std::move(endpointEventHandler))
         , RdmaClient(std::move(rdmaClient))