Skip to content

Commit fbdeb3c

Browse files
authored
Hotfix: disable PDisk serial number management (#5329)
1 parent 63b8e66 commit fbdeb3c

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

ydb/core/blobstorage/nodewarden/node_warden_impl.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@ void TNodeWarden::RemoveDrivesWithBadSerialsAndReport(TVector<NPDisk::TDriveData
8989
}
9090

9191
TVector<NPDisk::TDriveData> TNodeWarden::ListLocalDrives() {
92+
return {};
93+
94+
#if 0
9295
TStringStream details;
9396
TVector<NPDisk::TDriveData> drives = ListDevicesWithPartlabel(details);
9497

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

116119
return drives;
120+
#endif
117121
}
118122

119123
void TNodeWarden::StartInvalidGroupProxy() {

ydb/core/mind/bscontroller/cmds_drive_status.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ namespace NKikimr::NBsController {
8585
item->SetPath(pdiskInfo.Path);
8686
item->SetStatus(pdiskInfo.Status);
8787
item->SetPDiskId(pdiskId.PDiskId);
88-
item->SetSerial(pdiskInfo.ExpectedSerial);
88+
//item->SetSerial(pdiskInfo.ExpectedSerial);
8989
item->SetStatusChangeTimestamp(pdiskInfo.StatusTimestamp.GetValue());
9090
}
9191
return true;

ydb/core/mind/bscontroller/config.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ namespace NKikimr::NBsController {
9797
}
9898
pdisk->SetPDiskGuid(pdiskInfo.Guid);
9999
pdisk->SetPDiskCategory(pdiskInfo.Kind.GetRaw());
100-
pdisk->SetExpectedSerial(pdiskInfo.ExpectedSerial);
100+
//pdisk->SetExpectedSerial(pdiskInfo.ExpectedSerial);
101101
pdisk->SetManagementStage(Self->SerialManagementStage);
102102
if (pdiskInfo.PDiskConfig && !pdisk->MutablePDiskConfig()->ParseFromString(pdiskInfo.PDiskConfig)) {
103103
// TODO(alexvru): report this somehow
@@ -911,8 +911,8 @@ namespace NKikimr::NBsController {
911911
pb->SetDecommitStatus(pdisk.DecommitStatus);
912912
pb->MutablePDiskMetrics()->CopyFrom(pdisk.Metrics);
913913
pb->MutablePDiskMetrics()->ClearPDiskId();
914-
pb->SetExpectedSerial(pdisk.ExpectedSerial);
915-
pb->SetLastSeenSerial(pdisk.LastSeenSerial);
914+
//pb->SetExpectedSerial(pdisk.ExpectedSerial);
915+
//pb->SetLastSeenSerial(pdisk.LastSeenSerial);
916916
}
917917

918918
void TBlobStorageController::Serialize(NKikimrBlobStorage::TVSlotId *pb, TVSlotId id) {

ydb/core/mind/bscontroller/register_node.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ void TBlobStorageController::ReadPDisk(const TPDiskId& pdiskId, const TPDiskInfo
418418
(PDiskId, pdiskId.PDiskId));
419419
}
420420
}
421-
pDisk->SetExpectedSerial(pdisk.ExpectedSerial);
421+
//pDisk->SetExpectedSerial(pdisk.ExpectedSerial);
422422
pDisk->SetManagementStage(SerialManagementStage);
423423
pDisk->SetSpaceColorBorder(PDiskSpaceColorBorder);
424424
pDisk->SetEntityStatus(entityStatus);

0 commit comments

Comments
 (0)