Reacquire shadow disk to read-only after changed to ready with long t…

…imeout
ydb-platform · Dec 25, 2024 · da24f35 · da24f35
1 parent 527dc89
commit da24f35
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/cloud/blockstore/libs/storage/volume/actors/shadow_disk_actor.cpp b/cloud/blockstore/libs/storage/volume/actors/shadow_disk_actor.cpp
@@ -902,7 +902,8 @@ bool TShadowDiskActor::AreWritesToSrcDiskForbidden() const
 
 bool TShadowDiskActor::AreWritesToSrcDiskImpossible() const
 {
-    return AreWritesToSrcDiskForbidden() || ForcedReAcquireInProgress;
+    return AreWritesToSrcDiskForbidden() ||
+           (ForcedReAcquireInProgress && State == EActorState::Preparing);
 }
 
 bool TShadowDiskActor::WaitingForAcquire() const
@@ -1166,7 +1167,12 @@ bool TShadowDiskActor::HandleRWClientIdChanged(
     }
 
     // Reacquire shadow disk with new clientId.
-    AcquireShadowDisk(ctx, EAcquireReason::ForcedReAcquire);
+    const bool clientChanged =
+        CurrentShadowDiskClientId !=
+        MakeShadowDiskClientId(SourceDiskClientId, ReadOnlyMount());
+    if (clientChanged || !WaitingForAcquire()) {
+        AcquireShadowDisk(ctx, EAcquireReason::ForcedReAcquire);
+    }
 
     // It is necessary to handle the EvRWClientIdChanged message in the base
     // class TNonreplicatedPartitionMigrationCommonActor too.