Make cooldown timeout on VDisk flexible

ydb-platform · May 15, 2024 · 89ba287 · 89ba287
1 parent ed038e2
commit 89ba287
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/ydb/core/blobstorage/dsproxy/dsproxy_put.cpp b/ydb/core/blobstorage/dsproxy/dsproxy_put.cpp
@@ -138,7 +138,7 @@ class TBlobStorageGroupPutRequest : public TBlobStorageGroupRequestActor<TBlobSt
     }
 
     void HandleIncarnation(TMonotonic timestamp, ui32 orderNumber, ui64 incarnationGuid) {
-        timestamp += TDuration::Seconds(15); // TODO: cooldown timeout
+        timestamp += VDiskCooldownTimeoutOnProxy;
 
         Y_ABORT_UNLESS(orderNumber < IncarnationRecords.size());
         auto& record = IncarnationRecords[orderNumber];

diff --git a/ydb/core/blobstorage/nodewarden/node_warden_vdisk.cpp b/ydb/core/blobstorage/nodewarden/node_warden_vdisk.cpp
@@ -6,8 +6,6 @@
 
 namespace NKikimr::NStorage {
 
-    constexpr TDuration PDISK_CONFIDENCE_DELAY = TDuration::Seconds(15);
-
     void TNodeWarden::DestroyLocalVDisk(TVDiskRecord& vdisk) {
         STLOG(PRI_INFO, BS_NODE, NW35, "DestroyLocalVDisk", (VDiskId, vdisk.GetVDiskId()), (VSlotId, vdisk.GetVSlotId()));
         Y_ABORT_UNLESS(!vdisk.RuntimeData);
@@ -296,7 +294,7 @@ namespace NKikimr::NStorage {
             StartLocalVDiskActor(record, TDuration::Zero());
         } else if (record.RuntimeData->DonorMode < record.Config.HasDonorMode() || record.RuntimeData->ReadOnly != record.Config.GetReadOnly()) {
             PoisonLocalVDisk(record);
-            StartLocalVDiskActor(record, PDISK_CONFIDENCE_DELAY);
+            StartLocalVDiskActor(record, VDiskCooldownTimeout);
         }
     }
 
@@ -323,7 +321,7 @@ namespace NKikimr::NStorage {
             auto& record = it->second;
             if (record.GetVDiskId() == vDiskId) {
                 PoisonLocalVDisk(record);
-                StartLocalVDiskActor(record, PDISK_CONFIDENCE_DELAY);
+                StartLocalVDiskActor(record, VDiskCooldownTimeout);
                 break;
             }
         }

diff --git a/ydb/core/blobstorage/vdisk/localrecovery/localrecovery_public.cpp b/ydb/core/blobstorage/vdisk/localrecovery/localrecovery_public.cpp
@@ -596,7 +596,7 @@ namespace NKikimr {
             LOG_NOTICE(ctx, BS_LOCALRECOVERY,
                        VDISKP(LocRecCtx->VCtx->VDiskLogPrefix, "LocalRecovery START"));
 
-            SendYardInit(ctx, Config->BaseInfo.YardInitDelay);
+            SendYardInit(ctx, TDuration::Zero());
             Become(&TThis::StateInitialize, ctx, VDiskCooldownTimeout, new TEvents::TEvWakeup);
             VDiskMonGroup.VDiskLocalRecoveryState() = TDbMon::TDbLocalRecovery::YardInit;
         }

diff --git a/ydb/core/blobstorage/vdisk/syncer/blobstorage_syncer.cpp b/ydb/core/blobstorage/vdisk/syncer/blobstorage_syncer.cpp
@@ -297,11 +297,14 @@ namespace NKikimr {
                 return;
             }
 
-            Become(&TThis::RecoverLostDataStateFunc);
+            Become(&TThis::RecoverLostDataStateFunc, SyncerCtx->Config->BaseInfo.YardInitDelay, new TEvents::TEvWakeup);
+            Phase = TPhaseVal::PhaseRecoverLostData;
+        }
+
+        void RecoverLostDataResumeAfterDelay(const TActorContext& ctx) {
             const TVDiskEternalGuid guid = GuidRecovOutcome->Guid;
             RecoverLostDataId = ctx.Register(CreateSyncerRecoverLostDataActor(SyncerCtx, GInfo, CommitterId, ctx.SelfID, guid));
             ActiveActors.Insert(RecoverLostDataId, __FILE__, __LINE__, ctx, NKikimrServices::BLOBSTORAGE);
-            Phase = TPhaseVal::PhaseRecoverLostData;
         }
 
         void Handle(TEvSyncerLostDataRecovered::TPtr &ev, const TActorContext &ctx) {
@@ -322,6 +325,7 @@ namespace NKikimr {
             HFunc(TEvents::TEvPoisonPill, HandlePoison)
             HFunc(TEvSublogLine, Handle)
             HFunc(TEvVGenerationChange, RecoverLostDataModeHandle)
+            CFunc(TEvents::TSystem::Wakeup, RecoverLostDataResumeAfterDelay);
         )
 
         ////////////////////////////////////////////////////////////////////////