From f1b3e59e3cf3208e2465960c7070ec9060e39507 Mon Sep 17 00:00:00 2001 From: Alexander Rutkovsky Date: Fri, 7 Jun 2024 13:48:56 +0000 Subject: [PATCH] Hotfix: disable PDisk serial number management --- ydb/core/blobstorage/nodewarden/node_warden_impl.cpp | 4 ++++ ydb/core/mind/bscontroller/cmds_drive_status.cpp | 2 +- ydb/core/mind/bscontroller/config.cpp | 6 +++--- ydb/core/mind/bscontroller/register_node.cpp | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ydb/core/blobstorage/nodewarden/node_warden_impl.cpp b/ydb/core/blobstorage/nodewarden/node_warden_impl.cpp index ae71ba2387a1..579d14a060e6 100644 --- a/ydb/core/blobstorage/nodewarden/node_warden_impl.cpp +++ b/ydb/core/blobstorage/nodewarden/node_warden_impl.cpp @@ -89,6 +89,9 @@ void TNodeWarden::RemoveDrivesWithBadSerialsAndReport(TVector TNodeWarden::ListLocalDrives() { + return {}; + +#if 0 TStringStream details; TVector drives = ListDevicesWithPartlabel(details); @@ -114,6 +117,7 @@ TVector TNodeWarden::ListLocalDrives() { RemoveDrivesWithBadSerialsAndReport(drives, details); return drives; +#endif } void TNodeWarden::StartInvalidGroupProxy() { diff --git a/ydb/core/mind/bscontroller/cmds_drive_status.cpp b/ydb/core/mind/bscontroller/cmds_drive_status.cpp index 43c42725a2bd..f9da816720c4 100644 --- a/ydb/core/mind/bscontroller/cmds_drive_status.cpp +++ b/ydb/core/mind/bscontroller/cmds_drive_status.cpp @@ -85,7 +85,7 @@ namespace NKikimr::NBsController { item->SetPath(pdiskInfo.Path); item->SetStatus(pdiskInfo.Status); item->SetPDiskId(pdiskId.PDiskId); - item->SetSerial(pdiskInfo.ExpectedSerial); + //item->SetSerial(pdiskInfo.ExpectedSerial); item->SetStatusChangeTimestamp(pdiskInfo.StatusTimestamp.GetValue()); } return true; diff --git a/ydb/core/mind/bscontroller/config.cpp b/ydb/core/mind/bscontroller/config.cpp index 0854afdb3a00..d9060862d6f7 100644 --- a/ydb/core/mind/bscontroller/config.cpp +++ b/ydb/core/mind/bscontroller/config.cpp @@ -97,7 +97,7 @@ namespace NKikimr::NBsController { } pdisk->SetPDiskGuid(pdiskInfo.Guid); pdisk->SetPDiskCategory(pdiskInfo.Kind.GetRaw()); - pdisk->SetExpectedSerial(pdiskInfo.ExpectedSerial); + //pdisk->SetExpectedSerial(pdiskInfo.ExpectedSerial); pdisk->SetManagementStage(Self->SerialManagementStage); if (pdiskInfo.PDiskConfig && !pdisk->MutablePDiskConfig()->ParseFromString(pdiskInfo.PDiskConfig)) { // TODO(alexvru): report this somehow @@ -896,8 +896,8 @@ namespace NKikimr::NBsController { pb->SetDecommitStatus(pdisk.DecommitStatus); pb->MutablePDiskMetrics()->CopyFrom(pdisk.Metrics); pb->MutablePDiskMetrics()->ClearPDiskId(); - pb->SetExpectedSerial(pdisk.ExpectedSerial); - pb->SetLastSeenSerial(pdisk.LastSeenSerial); + //pb->SetExpectedSerial(pdisk.ExpectedSerial); + //pb->SetLastSeenSerial(pdisk.LastSeenSerial); } void TBlobStorageController::Serialize(NKikimrBlobStorage::TVSlotId *pb, TVSlotId id) { diff --git a/ydb/core/mind/bscontroller/register_node.cpp b/ydb/core/mind/bscontroller/register_node.cpp index 1b9bf3a2a73f..e8091e78b964 100644 --- a/ydb/core/mind/bscontroller/register_node.cpp +++ b/ydb/core/mind/bscontroller/register_node.cpp @@ -418,7 +418,7 @@ void TBlobStorageController::ReadPDisk(const TPDiskId& pdiskId, const TPDiskInfo (PDiskId, pdiskId.PDiskId)); } } - pDisk->SetExpectedSerial(pdisk.ExpectedSerial); + //pDisk->SetExpectedSerial(pdisk.ExpectedSerial); pDisk->SetManagementStage(SerialManagementStage); pDisk->SetSpaceColorBorder(PDiskSpaceColorBorder); pDisk->SetEntityStatus(entityStatus);