.

Author: SammyVimes

ydb/core/blobstorage/pdisk/blobstorage_pdisk_actor.cpp

@@ -39,6 +39,21 @@ namespace NPDisk {
 
 LWTRACE_USING(BLOBSTORAGE_PROVIDER);
 
+void CreatePDiskActor(
+        TGenericExecutorThread& executorThread,
+        const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters,
+        const TIntrusivePtr<TPDiskConfig> &cfg,
+        const NPDisk::TMainKey &mainKey,
+        ui32 pDiskID, ui32 poolId, ui32 nodeId
+) {
+
+    TActorId actorId = executorThread.RegisterActor(CreatePDisk(cfg, mainKey, counters), TMailboxType::ReadAsFilled, poolId);
+
+    TActorId pDiskServiceId = MakeBlobStoragePDiskID(nodeId, pDiskID);
+
+    executorThread.ActorSystem->RegisterLocalService(pDiskServiceId, actorId);
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // PDisk Actor
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -993,29 +1008,48 @@ class TPDiskActor : public TActorBootstrapped<TPDiskActor> {
             return;
         }
 
+        if (PendingRestartResponse) {
+            PendingRestartResponse(restartAllowed, ev->Get()->Details);
+            PendingRestartResponse = {};
+        }
+
         if (restartAllowed) {
-            MainKey = ev->Get()->MainKey;
+            NPDisk::TMainKey newMainKey = ev->Get()->MainKey;
+
             SecureWipeBuffer((ui8*)ev->Get()->MainKey.Keys.data(), sizeof(NPDisk::TKey) * ev->Get()->MainKey.Keys.size());
+            
             LOG_NOTICE_S(*TlsActivationContext, NKikimrServices::BS_PDISK, "PDiskId# " << PDisk->PDiskId
                     << " Going to restart PDisk since recieved TEvAskWardenRestartPDiskResult");
 
+            const TActorIdentity& thisActorId = SelfId();
+            ui32 nodeId = thisActorId.NodeId();
+            ui32 poolId = thisActorId.PoolID();
+            ui32 pdiskId = PDisk->PDiskId;
+
             PDisk->Stop();
 
+            TIntrusivePtr<TPDiskConfig> actorCfg = std::move(Cfg);
+
             auto& newCfg = ev->Get()->Config;
+            
             if (newCfg) {
-                Y_VERIFY_S(Cfg->PDiskId == PDisk->PDiskId,
-                        "New config's PDiskId# " << newCfg->PDiskId << " is not equal to real PDiskId# " << PDisk->PDiskId);
-                Cfg = std::move(newCfg);
+                Y_VERIFY_S(newCfg->PDiskId == pdiskId,
+                        "New config's PDiskId# " << newCfg->PDiskId << " is not equal to real PDiskId# " << pdiskId);
+
+                actorCfg = std::move(newCfg);
             }
 
-            StartPDiskThread();
+            const TActorContext& actorCtx = ActorContext();
 
-            Send(ev->Sender, new TEvBlobStorage::TEvNotifyWardenPDiskRestarted(PDisk->PDiskId));
-        }
+            auto& counters = AppData(actorCtx)->Counters;
 
-        if (PendingRestartResponse) {
-            PendingRestartResponse(restartAllowed, ev->Get()->Details);
-            PendingRestartResponse = {};
+            TGenericExecutorThread& executorThread = actorCtx.ExecutorThread;
+
+            PassAway();
+            
+            CreatePDiskActor(executorThread, counters, actorCfg, newMainKey, pdiskId, poolId, nodeId);
+
+            Send(ev->Sender, new TEvBlobStorage::TEvNotifyWardenPDiskRestarted(pdiskId));
         }
     }
 
@@ -1290,10 +1324,7 @@ IActor* CreatePDisk(const TIntrusivePtr<TPDiskConfig> &cfg, const NPDisk::TMainK
 
 void TRealPDiskServiceFactory::Create(const TActorContext &ctx, ui32 pDiskID,
         const TIntrusivePtr<TPDiskConfig> &cfg, const NPDisk::TMainKey &mainKey, ui32 poolId, ui32 nodeId) {
-    TActorId actorId = ctx.ExecutorThread.RegisterActor(
-        CreatePDisk(cfg, mainKey, AppData(ctx)->Counters), TMailboxType::ReadAsFilled, poolId);
-    TActorId pDiskServiceId = MakeBlobStoragePDiskID(nodeId, pDiskID);
-    ctx.ExecutorThread.ActorSystem->RegisterLocalService(pDiskServiceId, actorId);
+    CreatePDiskActor(ctx.ExecutorThread, AppData(ctx)->Counters, cfg, mainKey, pDiskID, poolId, nodeId);
 }
 
 } // NKikimr

ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.cpp

@@ -305,6 +305,7 @@ void TPDisk::Stop() {
         LOG_NOTICE_S(*ActorSystem, NKikimrServices::BS_PDISK, "PDiskId# " << PDiskId
                 << " shutdown owner info# " << StartupOwnerInfo());
     }
+
     BlockDevice->Stop();
 
     // BlockDevice is stopped, the data will NOT hit the disk.

ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut.cpp

@@ -503,8 +503,9 @@ Y_UNIT_TEST_SUITE(TPDiskTest) {
         TVDiskMock vdisk(&testCtx);
         vdisk.InitFull();
         vdisk.SendEvLogSync();
-        testCtx.Send(new TEvBlobStorage::TEvAskWardenRestartPDiskResult(testCtx.GetPDisk()->PDiskId, testCtx.MainKey, true, nullptr));
-        const auto evInitRes = testCtx.Recv<TEvBlobStorage::TEvNotifyWardenPDiskRestarted>();
+
+        testCtx.StartPDiskRestart();
+
         vdisk.InitFull();
         vdisk.SendEvLogSync();
     }
@@ -928,8 +929,7 @@ Y_UNIT_TEST_SUITE(TPDiskTest) {
         while (writeLog() == NKikimrProto::OK) {}
         UNIT_ASSERT_VALUES_EQUAL(writeLog(), NKikimrProto::OUT_OF_SPACE);
 
-        testCtx.Send(new TEvBlobStorage::TEvAskWardenRestartPDiskResult(testCtx.GetPDisk()->PDiskId, testCtx.MainKey, true, nullptr));
-        const auto evInitRes = testCtx.Recv<TEvBlobStorage::TEvNotifyWardenPDiskRestarted>();
+        testCtx.StartPDiskRestart();
 
         vdisk.InitFull();
         vdisk.SendEvLogSync();
@@ -943,8 +943,8 @@ Y_UNIT_TEST_SUITE(PDiskCompatibilityInfo) {
     using TCurrent = NKikimrConfig::TCurrentCompatibilityInfo;
     THolder<NPDisk::TEvYardInitResult> RestartPDisk(TActorTestContext& testCtx, ui32 pdiskId, TVDiskMock& vdisk, TCurrent* newInfo) {
         TCompatibilityInfoTest::Reset(newInfo);
-        testCtx.Send(new TEvBlobStorage::TEvAskWardenRestartPDiskResult(pdiskId, testCtx.MainKey, true, nullptr));
-        testCtx.Recv<TEvBlobStorage::TEvNotifyWardenPDiskRestarted>();
+        Y_UNUSED(pdiskId);
+        testCtx.StartPDiskRestart();
         testCtx.Send(new NPDisk::TEvYardInit(vdisk.OwnerRound.fetch_add(1), vdisk.VDiskID, testCtx.TestCtx.PDiskGuid));
         return testCtx.Recv<NPDisk::TEvYardInitResult>();
     }

ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_env.h

@@ -125,9 +125,25 @@ struct TActorTestContext {
                     new NPDisk::TEvYardControl(NPDisk::TEvYardControl::GetPDiskPointer, nullptr),
                     NKikimrProto::OK);
             PDisk = reinterpret_cast<NPDisk::TPDisk*>(evControlRes->Cookie);
+
+            PDiskActor = PDisk->PDiskActor;
         }
         return PDisk;
     }
+    
+    void StartPDiskRestart() {
+        Send(new TEvBlobStorage::TEvAskWardenRestartPDiskResult(GetPDisk()->PDiskId, MainKey, true, nullptr));
+        const auto evInitRes = Recv<TEvBlobStorage::TEvNotifyWardenPDiskRestarted>();
+
+        if (!Settings.UsePDiskMock) {
+            TActorId wellKnownPDiskActorId = MakeBlobStoragePDiskID(PDiskActor->NodeId(), PDisk->PDiskId);
+
+            PDisk = nullptr;
+
+            // We will temporarily use well know pdisk actor id, because restarted pdisk actor id is not yet known.
+            PDiskActor = wellKnownPDiskActorId;
+        }
+    }
 
     template<typename T>
     auto SafeRunOnPDisk(T&& f) {