diff options
| author | serg-belyakov <serg-belyakov@yandex-team.com> | 2022-09-06 15:50:41 +0300 |
|---|---|---|
| committer | serg-belyakov <serg-belyakov@yandex-team.com> | 2022-09-06 15:50:41 +0300 |
| commit | 72277b0f60b65f7ff162686fcac08becc2adc0d1 (patch) | |
| tree | 5a09aca5c37448e400606bdb483c494f6d09ebf7 | |
| parent | 96df1adeb1d068660b1117244bf8143e735341b3 (diff) | |
| download | ydb-72277b0f60b65f7ff162686fcac08becc2adc0d1.tar.gz | |
Improve dsproxy mock space color flag setter,
SetStorageStatusFlagsByColor in group mock now takes TPDiskSpaceColor::E as an argument
| -rw-r--r-- | ydb/core/blobstorage/dsproxy/mock/model.h | 35 | ||||
| -rw-r--r-- | ydb/core/blobstorage/pdisk/blobstorage_pdisk_util_space_color.h | 2 |
2 files changed, 5 insertions, 32 deletions
diff --git a/ydb/core/blobstorage/dsproxy/mock/model.h b/ydb/core/blobstorage/dsproxy/mock/model.h index 79c1cd52c1b..16783993f28 100644 --- a/ydb/core/blobstorage/dsproxy/mock/model.h +++ b/ydb/core/blobstorage/dsproxy/mock/model.h @@ -1,6 +1,7 @@ #pragma once #include <ydb/core/base/blobstorage.h> +#include <ydb/core/blobstorage/pdisk/blobstorage_pdisk_util_space_color.h> namespace NKikimr { namespace NFake { @@ -324,38 +325,8 @@ namespace NFake { return StorageStatusFlags; } - void SetStorageStatusFlagsByColor(NKikimrBlobStorage::EStatusFlags color) { - // Only changes StorageStatusFlags if given EStatusFlags value is color - // Also raises all color flags, that are 'greener' than given - - ui32 newFlags = NKikimrBlobStorage::StatusIsValid; - switch (color) { - case NKikimrBlobStorage::StatusDiskSpaceBlack: - newFlags |= ui32(NKikimrBlobStorage::StatusDiskSpaceBlack); - [[fallthrough]]; - case NKikimrBlobStorage::StatusDiskSpaceRed: - newFlags |= ui32(NKikimrBlobStorage::StatusDiskSpaceRed); - [[fallthrough]]; - case NKikimrBlobStorage::StatusDiskSpaceOrange: - newFlags |= ui32(NKikimrBlobStorage::StatusDiskSpaceOrange); - [[fallthrough]]; - case NKikimrBlobStorage::StatusDiskSpaceLightOrange: - newFlags |= ui32(NKikimrBlobStorage::StatusDiskSpaceLightOrange); - [[fallthrough]]; - case NKikimrBlobStorage::StatusDiskSpaceYellowStop: - newFlags |= ui32(NKikimrBlobStorage::StatusDiskSpaceYellowStop); - [[fallthrough]]; - case NKikimrBlobStorage::StatusDiskSpaceLightYellowMove: - newFlags |= ui32(NKikimrBlobStorage::StatusDiskSpaceLightYellowMove); - [[fallthrough]]; - case NKikimrBlobStorage::StatusDiskSpaceCyan: - newFlags |= ui32(NKikimrBlobStorage::StatusDiskSpaceCyan); - break; - default: - newFlags = 0; - break; - } - StorageStatusFlags.Merge(newFlags); + void SetStorageStatusFlagsByColor(NKikimrBlobStorage::TPDiskSpaceColor::E color) { + StorageStatusFlags = TStorageStatusFlags(SpaceColorToStatusFlag(color)); } void SetStorageStatusFlags(TStorageStatusFlags flags) { diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_util_space_color.h b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_util_space_color.h index 0e1f77b8de7..f14e87a0caa 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_util_space_color.h +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_util_space_color.h @@ -4,6 +4,8 @@ #include <ydb/core/protos/blobstorage_config.pb.h> #include <ydb/core/protos/blobstorage.pb.h> +#include <ydb/core/blobstorage/pdisk/blobstorage_pdisk_defs.h> + namespace NKikimr { inline NKikimrBlobStorage::TPDiskSpaceColor::E StatusFlagToSpaceColor(NPDisk::TStatusFlags flags) { |