Skip to content

Hotfix: disable PDisk serial number management #5329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 7, 2024
Merged

Hotfix: disable PDisk serial number management #5329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ydb/core/blobstorage/nodewarden/node_warden_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ void TNodeWarden::RemoveDrivesWithBadSerialsAndReport(TVector<NPDisk::TDriveData
}

TVector<NPDisk::TDriveData> TNodeWarden::ListLocalDrives() {
return {};

#if 0
TStringStream details;
TVector<NPDisk::TDriveData> drives = ListDevicesWithPartlabel(details);

Expand All @@ -114,6 +117,7 @@ TVector<NPDisk::TDriveData> TNodeWarden::ListLocalDrives() {
RemoveDrivesWithBadSerialsAndReport(drives, details);

return drives;
#endif
}

void TNodeWarden::StartInvalidGroupProxy() {
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/mind/bscontroller/cmds_drive_status.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ydb/core/mind/bscontroller/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/mind/bscontroller/register_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading