diff options
| author | yuryalekseev <yuryalekseev@yandex-team.com> | 2023-01-23 21:54:02 +0300 |
|---|---|---|
| committer | yuryalekseev <yuryalekseev@yandex-team.com> | 2023-01-23 21:54:02 +0300 |
| commit | fac9bc3d78fd1dad019242be1e814ccbaf7e2888 (patch) | |
| tree | 7fa8c38904e99b6925ba23f5cbaaccdd2f8dc47d | |
| parent | 8b87d77cd8a474a37bf6b6fd65c0872be2f1a997 (diff) | |
| download | ydb-fac9bc3d78fd1dad019242be1e814ccbaf7e2888.tar.gz | |
Add ExpectedSerial to dstool pdisk list.
| -rw-r--r-- | ydb/apps/dstool/lib/dstool_cmd_pdisk_list.py | 3 | ||||
| -rw-r--r-- | ydb/core/mind/bscontroller/config.cpp | 1 | ||||
| -rw-r--r-- | ydb/core/protos/blobstorage_config.proto | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/ydb/apps/dstool/lib/dstool_cmd_pdisk_list.py b/ydb/apps/dstool/lib/dstool_cmd_pdisk_list.py index 3ac2daea25..d9fbcb831a 100644 --- a/ydb/apps/dstool/lib/dstool_cmd_pdisk_list.py +++ b/ydb/apps/dstool/lib/dstool_cmd_pdisk_list.py @@ -18,6 +18,7 @@ def do(args): 'NodeId:PDiskId', 'NodeId', 'PDiskId', + 'ExpectedSerial', 'FQDN', 'Path', 'Type', @@ -38,6 +39,7 @@ def do(args): ] visible_columns = [ 'NodeId:PDiskId', + 'ExpectedSerial', 'FQDN', 'Path', 'Type', @@ -69,6 +71,7 @@ def do(args): rows = [] for pdisk in base_config.PDisk: row = {} + row['ExpectedSerial'] = pdisk.ExpectedSerial row['NodeId:PDiskId'] = '[%u:%u]' % (pdisk.NodeId, pdisk.PDiskId) row['NodeId'] = pdisk.NodeId row['PDiskId'] = pdisk.PDiskId diff --git a/ydb/core/mind/bscontroller/config.cpp b/ydb/core/mind/bscontroller/config.cpp index 638a9ffbfb..b123a57e2d 100644 --- a/ydb/core/mind/bscontroller/config.cpp +++ b/ydb/core/mind/bscontroller/config.cpp @@ -823,6 +823,7 @@ namespace NKikimr::NBsController { pb->SetDecommitStatus(pdisk.DecommitStatus); pb->MutablePDiskMetrics()->CopyFrom(pdisk.Metrics); pb->MutablePDiskMetrics()->ClearPDiskId(); + pb->SetExpectedSerial(pdisk.ExpectedSerial); } void TBlobStorageController::Serialize(NKikimrBlobStorage::TVSlotId *pb, TVSlotId id) { diff --git a/ydb/core/protos/blobstorage_config.proto b/ydb/core/protos/blobstorage_config.proto index 9dec28e46b..02a1a463e8 100644 --- a/ydb/core/protos/blobstorage_config.proto +++ b/ydb/core/protos/blobstorage_config.proto @@ -595,6 +595,7 @@ message TBaseConfig { NKikimrBlobStorage.TPDiskMetrics PDiskMetrics = 14; uint64 DriveStatusChangeTimestamp = 15; // TInstant::GetValue() EDecommitStatus DecommitStatus = 16; + string ExpectedSerial = 17; } message TVSlot { message TDonorDisk { |