fix NBS shadow disk issue #3097

Author: Georg-0001

cloud/blockstore/libs/diagnostics/critical_events.h

@@ -65,6 +65,7 @@ namespace NCloud::NBlockStore {
     xxx(ErrorWasSentToTheGuestForNonReliableDisk)                              \
     xxx(MirroredDiskResyncChecksumMismatch)                                    \
     xxx(DiskAgentInconsistentMultiWriteResponse)                               \
+    xxx(ReleaseShadowDiskError)                                                \
 // BLOCKSTORE_CRITICAL_EVENTS
 
 #define BLOCKSTORE_DISK_AGENT_CRITICAL_EVENTS(xxx)                             \

cloud/blockstore/libs/storage/disk_agent/model/device_client.cpp

@@ -257,6 +257,12 @@ NCloud::NProto::TError TDeviceClient::ReleaseDevices(
             STORAGE_INFO("Device %s was released by client %s for writing.",
                     uuid.Quote().c_str(), clientId.c_str());
             deviceState->WriterSession = {};
+        } else if (clientId == AnyReaderClientId) {
+            STORAGE_INFO(
+                "Device %s was released by client %s for reading.",
+                uuid.Quote().c_str(),
+                clientId.c_str());
+            deviceState->ReaderSessions = {};
         }
     }
 

cloud/blockstore/libs/storage/disk_agent/model/device_client_ut.cpp

@@ -816,6 +816,40 @@ Y_UNIT_TEST_SUITE(TDeviceClientTest)
             E_REJECTED,
             client.GetDeviceIOErrorCode("uuid2").value());
     }
+
+    Y_UNIT_TEST_F(TestReleaseDevicesForAnyReader, TFixture)
+    {
+        auto client = CreateClient({.Devices = {"uuid1", "uuid2"}});
+
+        // acquire devices for reading
+        auto error = AcquireDevices(
+            client,
+            TAcquireParamsBuilder()
+                .SetUuids({"uuid1", "uuid2"})
+                .SetClientId("reader")
+                .SetAccessMode(NProto::VOLUME_ACCESS_READ_ONLY)
+                .SetDiskId("vol0")
+                .SetVolumeGeneration(1));
+        UNIT_ASSERT_VALUES_EQUAL_C(S_OK, error.GetCode(), error.GetMessage());
+
+        // check that reading sessions exist
+        UNIT_ASSERT_UNEQUAL(client.GetReaderSessions("uuid1").size(), 0);
+        UNIT_ASSERT_UNEQUAL(client.GetReaderSessions("uuid2").size(), 0);
+
+        // release should success
+        error = ReleaseDevices(
+            client,
+            TReleaseParamsBuilder()
+                .SetUuids({"uuid1", "uuid2"})
+                .SetClientId(TString(AnyReaderClientId))
+                .SetDiskId("vol0")
+                .SetVolumeGeneration(1));
+        UNIT_ASSERT_VALUES_EQUAL_C(S_OK, error.GetCode(), error.GetMessage());
+
+        // check that all reading sessions was realesed
+        UNIT_ASSERT_EQUAL(client.GetReaderSessions("uuid1").size(), 0);
+        UNIT_ASSERT_EQUAL(client.GetReaderSessions("uuid2").size(), 0);
+    }
 }
 
 }   // namespace NCloud::NBlockStore::NStorage

cloud/blockstore/libs/storage/disk_agent/model/public.h

@@ -20,5 +20,6 @@ constexpr TStringBuf AnyWriterClientId = "any-writer";
 constexpr TStringBuf ShadowDiskClientId = "shadow-disk-client";
 constexpr TStringBuf CheckRangeClientId = "check-range";
 constexpr TStringBuf CopyVolumeClientId = "copy-volume-client";
+constexpr TStringBuf AnyReaderClientId = "any-reader";
 
 }   // namespace NCloud::NBlockStore::NStorage

cloud/blockstore/libs/storage/volume/model/checkpoint.cpp

@@ -209,7 +209,9 @@ bool TCheckpointStore::NeedShadowActor(const TString& checkpointId) const
     // Do not need to create the shadow disk actor if the shadow disk is being
     // deleted.
     if (const TCheckpointRequest* checkpointRequest =
-            CheckpointRequests.FindPtr(CheckpointRequestInProgress))
+            CheckpointRequests.FindPtr(CheckpointRequestInProgress);
+        checkpointRequest != nullptr &&
+        checkpointRequest->CheckpointId == checkpointId)
     {
         if (checkpointRequest->ReqType == ECheckpointRequestType::Delete ||
             checkpointRequest->ReqType == ECheckpointRequestType::DeleteData)