[nbs] delete checkpoint successfully even if it never existed (#1411)

* [nbs] delete checkpoint successfully even if it never existed * fix * fix
ydb-platform · Jun 14, 2024 · f7c923c · f7c923c
1 parent 28c1105
commit f7c923c
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 3 deletions.
diff --git a/cloud/blockstore/libs/storage/volume/model/checkpoint.cpp b/cloud/blockstore/libs/storage/volume/model/checkpoint.cpp
@@ -459,8 +459,9 @@ std::optional<NProto::TError> TCheckpointStore::ValidateCheckpointRequest(
                 return std::nullopt;
             }
             case ECheckpointRequestType::DeleteData:
-            case ECheckpointRequestType::Delete: {
                 return makeErrorInvalid("Checkpoint does not exist");
+            case ECheckpointRequestType::Delete: {
+                return makeErrorAlready("Checkpoint does not exist");
             }
         }
     }

diff --git a/cloud/blockstore/libs/storage/volume/model/checkpoint_ut.cpp b/cloud/blockstore/libs/storage/volume/model/checkpoint_ut.cpp
@@ -878,7 +878,7 @@ Y_UNIT_TEST_SUITE(TCheckpointStore)
 
         executeRequests(ECheckpointType::Normal, TVector<TStep>{
             {ECheckpointRequestType::DeleteData, E_PRECONDITION_FAILED},
-            {ECheckpointRequestType::Delete, E_PRECONDITION_FAILED},
+            {ECheckpointRequestType::Delete, S_ALREADY},
             {ECheckpointRequestType::Create, std::nullopt},
             {ECheckpointRequestType::Create, S_ALREADY},
             {ECheckpointRequestType::DeleteData, std::nullopt},
@@ -914,7 +914,7 @@ Y_UNIT_TEST_SUITE(TCheckpointStore)
             ECheckpointType::Light})
         {
             executeRequests(checkpointType, TVector<TStep>{
-                {ECheckpointRequestType::Delete, E_PRECONDITION_FAILED},
+                {ECheckpointRequestType::Delete, S_ALREADY},
                 {ECheckpointRequestType::Create, std::nullopt},
                 {ECheckpointRequestType::Create, S_ALREADY},
                 {ECheckpointRequestType::Delete, std::nullopt},

diff --git a/cloud/blockstore/libs/storage/volume/volume_ut_checkpoint.cpp b/cloud/blockstore/libs/storage/volume/volume_ut_checkpoint.cpp
@@ -4751,6 +4751,36 @@ Y_UNIT_TEST_SUITE(TVolumeCheckpointTest)
             volume.RecvCreateCheckpointResponse()->GetStatus());
     }
 
+    Y_UNIT_TEST(ShouldDeleteCheckpointEvenIfItNeverExisted)
+    {
+        NProto::TStorageServiceConfig storageServiceConfig;
+
+        auto runtime = PrepareTestActorRuntime(std::move(storageServiceConfig));
+
+        TVolumeClient volume(*runtime);
+        volume.UpdateVolumeConfig(
+            0,  // maxBandwidth
+            0,  // maxIops
+            0,  // burstPercentage
+            0,  // maxPostponedWeight
+            false,  // throttlingEnabled
+            1,  // version
+            NProto::STORAGE_MEDIA_SSD,
+            1024,   // block count per partition
+            "vol0",  // diskId
+            "cloud",  // cloudId
+            "folder",  // folderId
+            1,  // partition count
+            2  // blocksPerStripe
+        );
+        volume.WaitReady();
+
+        volume.SendDeleteCheckpointRequest("checkpoint_never_existed");
+        UNIT_ASSERT_VALUES_EQUAL(
+            S_ALREADY,
+            volume.RecvDeleteCheckpointResponse()->GetStatus());
+    }
+
     Y_UNIT_TEST(ShouldHandleGetChangedBlocksForShadowDiskBasedCheckpoint)
     {
         NProto::TStorageServiceConfig config;