stable-23-3 [Blockstore] Fix checkpoint without data creation (#777)

* NBS-4773 [blockstore] Fix checkpoint without data creation (#738) * write test ShouldNotReadFromCheckpointWithoutData * create normal checkpoint and delete data * pass CheckpointType when create checkpoint for network disk * fix clang-format * use NProto::ECheckpointType for checkpoint creation (#773)
ydb-platform · Mar 19, 2024 · 07b3ed9 · 07b3ed9
1 parent 5e86b0b
commit 07b3ed9
Show file tree

Hide file tree

Showing 4 changed files with 126 additions and 44 deletions.
diff --git a/cloud/blockstore/libs/storage/volume/testlib/test_env.cpp b/cloud/blockstore/libs/storage/volume/testlib/test_env.cpp
@@ -369,11 +369,11 @@ std::unique_ptr<TEvVolume::TEvDescribeBlocksRequest> TVolumeClient::CreateDescri
 std::unique_ptr<TEvService::TEvCreateCheckpointRequest>
 TVolumeClient::CreateCreateCheckpointRequest(
     const TString& checkpointId,
-    bool isLight)
+    NProto::ECheckpointType checkpointType)
 {
     auto request = std::make_unique<TEvService::TEvCreateCheckpointRequest>();
     request->Record.SetCheckpointId(checkpointId);
-    request->Record.SetIsLight(isLight);
+    request->Record.SetCheckpointType(checkpointType);
     return request;
 }
 

diff --git a/cloud/blockstore/libs/storage/volume/testlib/test_env.h b/cloud/blockstore/libs/storage/volume/testlib/test_env.h
@@ -393,7 +393,7 @@ class TVolumeClient
 
     std::unique_ptr<TEvService::TEvCreateCheckpointRequest> CreateCreateCheckpointRequest(
         const TString& checkpointId,
-        bool isLight = false);
+        NProto::ECheckpointType checkpointType = NProto::ECheckpointType::NORMAL);
 
     std::unique_ptr<TEvService::TEvDeleteCheckpointRequest> CreateDeleteCheckpointRequest(
         const TString& checkpointId);

diff --git a/cloud/blockstore/libs/storage/volume/volume_actor_checkpoint.cpp b/cloud/blockstore/libs/storage/volume/volume_actor_checkpoint.cpp
@@ -139,6 +139,7 @@ class TCheckpointActor final
     const TActorId VolumeActorId;
     const TPartitionDescrs PartitionDescrs;
     const TRequestTraceInfo TraceInfo;
+    const ECheckpointRequestType RequestType;
     const bool CreateCheckpointShadowDisk;
 
     ui32 DrainResponses = 0;
@@ -157,6 +158,7 @@ class TCheckpointActor final
         TActorId volumeActorId,
         TPartitionDescrs partitionDescrs,
         TRequestTraceInfo traceInfo,
+        ECheckpointRequestType requestType,
         bool createCheckpointShadowDisk);
 
     void Bootstrap(const TActorContext& ctx);
@@ -229,6 +231,7 @@ TCheckpointActor<TMethod>::TCheckpointActor(
         TActorId volumeActorId,
         TPartitionDescrs partitionDescrs,
         TRequestTraceInfo traceInfo,
+        ECheckpointRequestType requestType,
         bool createCheckpointShadowDisk)
     : RequestInfo(std::move(requestInfo))
     , RequestId(requestId)
@@ -238,6 +241,7 @@ TCheckpointActor<TMethod>::TCheckpointActor(
     , VolumeActorId(volumeActorId)
     , PartitionDescrs(std::move(partitionDescrs))
     , TraceInfo(std::move(traceInfo))
+    , RequestType(requestType)
     , CreateCheckpointShadowDisk(createCheckpointShadowDisk)
     , ChildCallContexts(Reserve(PartitionDescrs.size()))
 {}
@@ -688,6 +692,13 @@ void TCheckpointActor<TMethod>::DoActionForBlobStorageBasedPartition(
     const auto selfId = TBase::SelfId();
     auto request = std::make_unique<typename TMethod::TRequest>();
     request->Record.SetCheckpointId(CheckpointId);
+    if constexpr (std::is_same_v<TMethod, TCreateCheckpointMethod>) {
+        request->Record.SetCheckpointType(
+            RequestType == ECheckpointRequestType::CreateWithoutData
+                ? NProto::ECheckpointType::WITHOUT_DATA
+                : NProto::ECheckpointType::NORMAL
+        );
+    }
 
     ForkTraces(request->CallContext);
 
@@ -1156,6 +1167,7 @@ void TVolumeActor::ProcessNextCheckpointRequest(const TActorContext& ctx)
                         requestInfo->IsTraced,
                         requestInfo->TraceTs,
                         TraceSerializer),
+                    request.ReqType,
                     Config->GetUseShadowDisksForNonreplDiskCheckpoints());
             break;
         }
@@ -1180,6 +1192,7 @@ void TVolumeActor::ProcessNextCheckpointRequest(const TActorContext& ctx)
                         requestInfo->IsTraced,
                         requestInfo->TraceTs,
                         TraceSerializer),
+                    request.ReqType,
                     Config->GetUseShadowDisksForNonreplDiskCheckpoints());
             break;
         }
@@ -1198,6 +1211,7 @@ void TVolumeActor::ProcessNextCheckpointRequest(const TActorContext& ctx)
                         requestInfo->IsTraced,
                         requestInfo->TraceTs,
                         TraceSerializer),
+                    request.ReqType,
                     Config->GetUseShadowDisksForNonreplDiskCheckpoints());
             break;
         }