Revert "Rework FormatRead and SysLogRead, move their execution to PDi…

…sk to avoid race" (#10122)
ydb-platform · Oct 4, 2024 · d7773b7 · d7773b7
1 parent 1895bee
commit d7773b7
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 46 deletions.
diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_actor.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_actor.cpp
@@ -280,7 +280,7 @@ class TPDiskActor : public TActorBootstrapped<TPDiskActor> {
             str << " Config: " << Cfg->ToString();
             P_LOG(PRI_CRIT, BPD01, str.Str());
         } else {
-            PDisk->InputRequest(PDisk->ReqCreator.CreateFromArgs<TReadFormat>(SelfId()));
+            PDisk->InitiateReadSysLog(SelfId());
             StateErrorReason =
                 "PDisk is in StateInit, wait for PDisk to read sys log. Did you ckeck EvYardInit result? Marker# BSY09";
             Become(&TThis::StateInit);
@@ -557,8 +557,8 @@ class TPDiskActor : public TActorBootstrapped<TPDiskActor> {
                     // PDisk GUID is OK and format is complete
                     *PDisk->Mon.PDiskState = NKikimrBlobStorage::TPDiskState::InitialSysLogRead;
                     *PDisk->Mon.PDiskDetailedState = TPDiskMon::TPDisk::BootingSysLogRead;
-
-                    PDisk->InputRequest(PDisk->ReqCreator.CreateFromArgs<TReadSysLog>(SelfId()));
+                    PDisk->Format.InitMagic();
+                    PDisk->ReadSysLog(SelfId());
                 }
             }
         }
@@ -1083,7 +1083,7 @@ class TPDiskActor : public TActorBootstrapped<TPDiskActor> {
             }
 
             Send(ev->Sender, new TEvBlobStorage::TEvNotifyWardenPDiskRestarted(PCtx->PDiskId, NKikimrProto::EReplyStatus::NOTREADY));
-
+            
             return;
         }
 
@@ -1096,7 +1096,7 @@ class TPDiskActor : public TActorBootstrapped<TPDiskActor> {
             NPDisk::TMainKey newMainKey = ev->Get()->MainKey;
 
             SecureWipeBuffer((ui8*)ev->Get()->MainKey.Keys.data(), sizeof(NPDisk::TKey) * ev->Get()->MainKey.Keys.size());
-
+            
             P_LOG(PRI_NOTICE, BSP01, "Going to restart PDisk since received TEvAskWardenRestartPDiskResult");
 
             const TActorIdentity& thisActorId = SelfId();
@@ -1109,7 +1109,7 @@ class TPDiskActor : public TActorBootstrapped<TPDiskActor> {
             TIntrusivePtr<TPDiskConfig> actorCfg = std::move(Cfg);
 
             auto& newCfg = ev->Get()->Config;
-
+            
             if (newCfg) {
                 Y_VERIFY_S(newCfg->PDiskId == pdiskId,
                         "New config's PDiskId# " << newCfg->PDiskId << " is not equal to real PDiskId# " << pdiskId);
@@ -1124,7 +1124,7 @@ class TPDiskActor : public TActorBootstrapped<TPDiskActor> {
             TGenericExecutorThread& executorThread = actorCtx.ExecutorThread;
 
             PassAway();
-
+            
             CreatePDiskActor(executorThread, counters, actorCfg, newMainKey, pdiskId, poolId, nodeId);
 
             Send(ev->Sender, new TEvBlobStorage::TEvNotifyWardenPDiskRestarted(pdiskId));

diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.cpp
@@ -2487,11 +2487,6 @@ void TPDisk::ProcessFastOperationsQueue() {
                 break;
             case ERequestType::RequestContinueReadMetadata:
                 static_cast<TContinueReadMetadata&>(*req).Execute(PCtx->ActorSystem);
-            case ERequestType::RequestReadFormat:
-                InitiateReadFormat();
-                break;
-            case ERequestType::RequestReadSysLog:
-                InitiateReadSysLog();
                 break;
             default:
                 Y_FAIL_S("Unexpected request type# " << (ui64)req->GetType());
@@ -3087,8 +3082,6 @@ bool TPDisk::PreprocessRequest(TRequestBase *request) {
         case ERequestType::RequestReadMetadata:
         case ERequestType::RequestWriteMetadata:
         case ERequestType::RequestContinueReadMetadata:
-        case ERequestType::RequestReadFormat:
-        case ERequestType::RequestReadSysLog:
             break;
         case ERequestType::RequestStopDevice:
             BlockDevice->Stop();

diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.h b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.h
@@ -211,7 +211,7 @@ class TPDisk : public IPDisk {
     bool IsFormatMagicValid(ui8 *magicData, ui32 magicDataSize, const TMainKey& mainKey); // Called by actor
     bool CheckGuid(TString *outReason); // Called by actor
     bool CheckFormatComplete(); // Called by actor
-    void InitiateReadSysLog();
+    void ReadSysLog(const TActorId &pDiskActor); // Called by actor
     bool ProcessChunk0(const TEvReadLogResult &readLogResult, TString& errorReason);
     void PrintChunksDebugInfo();
     TRcBuf ProcessReadSysLogResult(ui64 &outWritePosition, ui64 &outLsn, const TEvReadLogResult &readLogResult);
@@ -394,8 +394,9 @@ class TPDisk : public IPDisk {
     // Internal interface
 
     // Schedules EvReadLogResult event for the system log
+    void ResetInit();
     bool Initialize(); // Called by actor
-    void InitiateReadFormat();
+    void InitiateReadSysLog(const TActorId &pDiskActor); // Called by actor
     void ProcessReadLogResult(const TEvReadLogResult &evReadLogResult, const TActorId &pDiskActor);
 
     NKikimrProto::EReplyStatus ValidateRequest(TLogWrite *logWrite, TStringStream& outErrorReason);
@@ -431,3 +432,4 @@ bool ParseSectorOffset(const TDiskFormat& format, TActorSystem *actorSystem, ui3
 
 } // NPDisk
 } // NKikimr
+
diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl_log.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl_log.cpp
@@ -205,10 +205,8 @@ void TPDisk::GetStartingPoints(NPDisk::TOwner owner, TMap<TLogSignature, NPDisk:
     }
 }
 
-void TPDisk::InitiateReadSysLog() {
-    Format.InitMagic();
-
-    TIntrusivePtr<TSysLogReader> sysLogReader(new TSysLogReader(this, PCtx->ActorSystem, PCtx->PDiskActor,
+void TPDisk::ReadSysLog(const TActorId &pDiskActor) {
+    TIntrusivePtr<TSysLogReader> sysLogReader(new TSysLogReader(this, PCtx->ActorSystem, pDiskActor,
                 TReqId(TReqId::ReadSysLog, 0)));
     sysLogReader->Start();
     return;
@@ -1312,15 +1310,15 @@ void TPDisk::MarkChunksAsReleased(TReleaseChunks& req) {
 }
 
 // Schedules EvReadLogResult event for the system log
-void TPDisk::InitiateReadFormat() {
+void TPDisk::InitiateReadSysLog(const TActorId &pDiskActor) {
     Y_VERIFY_S(PDiskThread.Running(), "expect PDiskThread to be running");
     Y_VERIFY_S(InitPhase == EInitPhase::Uninitialized, "expect InitPhase to be Uninitialized, but InitPhase# "
             << InitPhase);
     ui32 formatSectorsSize = FormatSectorSize * ReplicationFactor;
     THolder<TEvReadFormatResult> evReadFormatResult(new TEvReadFormatResult(formatSectorsSize, UseHugePages));
     ui8 *formatSectors = evReadFormatResult->FormatSectors.Get();
     BlockDevice->PreadAsync(formatSectors, formatSectorsSize, 0,
-        new TCompletionEventSender(this, PCtx->PDiskActor, evReadFormatResult.Release()), TReqId(TReqId::InitialFormatRead, 0), {});
+        new TCompletionEventSender(this, pDiskActor, evReadFormatResult.Release()), TReqId(TReqId::InitialFormatRead, 0), {});
     *Mon.PDiskState = NKikimrBlobStorage::TPDiskState::InitialFormatRead;
     *Mon.PDiskDetailedState = TPDiskMon::TPDisk::BootingFormatRead;
     InitPhase = EInitPhase::ReadingSysLog;

diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_request_id.h b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_request_id.h
@@ -153,8 +153,6 @@ enum class ERequestType {
     RequestWriteMetadataResult,
     RequestPushUnformattedMetadataSector,
     RequestContinueReadMetadata,
-    RequestReadFormat,
-    RequestReadSysLog,
 };
 
 inline IOutputStream& operator <<(IOutputStream& out, const TReqId& reqId) {

diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_requestimpl.h b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_requestimpl.h
@@ -119,28 +119,6 @@ class TRequestBase : public TThrRefBase {
     static void AbortDelete(TRequestBase* request, TActorSystem* actorSystem);
 };
 
-class TReadFormat : public TRequestBase {
-public:
-    TReadFormat(TActorId pdiskActor, TAtomicBase reqIdx)
-        : TRequestBase(pdiskActor, TReqId(TReqId::ReadFormatInfo, reqIdx), 0, 0, NPriInternal::Other)
-    {}
-
-    ERequestType GetType() const override {
-        return ERequestType::RequestReadFormat;
-    }
-};
-
-class TReadSysLog : public TRequestBase {
-public:
-    TReadSysLog(TActorId pdiskActor, TAtomicBase reqIdx)
-        : TRequestBase(pdiskActor, TReqId(TReqId::ReadSysLog, reqIdx), 0, 0, NPriInternal::Other)
-    {}
-
-    ERequestType GetType() const override {
-        return ERequestType::RequestReadSysLog;
-    }
-};
-
 //
 // TYardInit
 //