Skip to content

[Disk Manager] Prepare cells storage for metrics #4728

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

Open
Rattysed wants to merge 11 commits into
base: main
Choose a base branch
from
Open

[Disk Manager] Prepare cells storage for metrics #4728

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ce6c4c3
remove clusterCapacityState
Rattysed Nov 26, 2025
c7a9482
fix ydb scan
Rattysed Nov 26, 2025
613fcce
fix storage tests
Rattysed Nov 26, 2025
45c3f99
support time.Equal in tests
Rattysed Nov 26, 2025
7d3a70f
fix capacity task test
Rattysed Nov 27, 2025
32e1cce
finally all tests are fixed
Rattysed Nov 27, 2025
07609d1
set correct value in tests
Rattysed Nov 27, 2025
cd382e1
simplify matchClusterCapacities
Rattysed Nov 27, 2025
420c108
return time check into matchClusterCapacities
Rattysed Nov 27, 2025
05f3b8c
fix build
Rattysed Nov 27, 2025
a241e61
change ClusterCapacity comparation logic
Rattysed Dec 3, 2025
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
3 changes: 3 additions & 0 deletions cloud/disk_manager/internal/pkg/cells/collect_cluster_capacity_task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,8 @@ func (t *collectClusterCapacityTask) updateCellCapacity(
return err
}

createdAt := time.Now()

var capacities []storage.ClusterCapacity
for _, info := range capacityInfos {
capacities = append(capacities, storage.ClusterCapacity{
Expand All @@ -151,6 +153,7 @@ func (t *collectClusterCapacityTask) updateCellCapacity(
Kind: info.DiskKind,
FreeBytes: info.FreeBytes,
TotalBytes: info.TotalBytes,
CreatedAt: createdAt,
})
}

Expand Down
154 changes: 98 additions & 56 deletions cloud/disk_manager/internal/pkg/cells/collect_cluster_capacity_task_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,27 @@ import (

////////////////////////////////////////////////////////////////////////////////

func matchClusterCapacities(t *testing.T, expected cells_storage.ClusterCapacity) interface{} {
Copy link
Collaborator Author

@Rattysed Rattysed Nov 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Теперь CreatedAt задаём в коде таски, нужно сверять время. Обычно в таких случаях мы просто подставляем mock.Anything, но тут терялся бы смысл теста.

В матчере сравниваем полученное время с time.Now(), т.к. такой же time.Now() выставляется в коде таски. Минута про запас

return mock.MatchedBy(func(actual []cells_storage.ClusterCapacity) bool {
if len(actual) != 1 {
return false
}

got := actual[0]
if expected.FreeBytes != got.FreeBytes ||
expected.TotalBytes != got.TotalBytes ||
expected.CellID != got.CellID || expected.Kind != got.Kind ||
expected.ZoneID != got.ZoneID ||
time.Now().Sub(got.CreatedAt).Abs() >= time.Minute {
Copy link
Collaborator

@gy2411 gy2411 Dec 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Давай сначала сделаем проверку на время, потом приравняем время и сравним expected и got целиком на равенство? А то если в структуру потом добавится новое поле, то тут легко забыть добавить проверку.

Copy link
Collaborator Author

@Rattysed Rattysed Dec 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Логично. Исправил в обоих тестах

return false
}

return true
})
}

////////////////////////////////////////////////////////////////////////////////

func TestCollectClusterCapacityTask(t *testing.T) {
ctx := newContext()
execCtx := tasks_mocks.NewExecutionContextMock()
Expand Down Expand Up @@ -56,41 +77,50 @@ func TestCollectClusterCapacityTask(t *testing.T) {

storage.On("UpdateClusterCapacities",
mock.Anything, // ctx.
[]cells_storage.ClusterCapacity{
{
ZoneID: "zone-a",
CellID: "zone-a-cell1",
Kind: types.DiskKind_DISK_KIND_SSD,
FreeBytes: 1024,
TotalBytes: 2048,
matchClusterCapacities(
t,
[]cells_storage.ClusterCapacity{
{
ZoneID: "zone-a",
CellID: "zone-a-cell1",
Kind: types.DiskKind_DISK_KIND_SSD,
FreeBytes: 1024,
TotalBytes: 2048,
},
},
},
),
deleteOlderThanExpectation,
).Return(nil).Once()
storage.On("UpdateClusterCapacities",
mock.Anything, // ctx.
[]cells_storage.ClusterCapacity{
{
ZoneID: "zone-a",
CellID: "zone-a",
Kind: types.DiskKind_DISK_KIND_SSD,
FreeBytes: 1024,
TotalBytes: 2048,
matchClusterCapacities(
t,
[]cells_storage.ClusterCapacity{
{
ZoneID: "zone-a",
CellID: "zone-a",
Kind: types.DiskKind_DISK_KIND_SSD,
FreeBytes: 1024,
TotalBytes: 2048,
},
},
},
),
deleteOlderThanExpectation,
).Return(nil).Once()
storage.On("UpdateClusterCapacities",
mock.Anything, // ctx.
[]cells_storage.ClusterCapacity{
{
ZoneID: "zone-b",
CellID: "zone-b",
Kind: types.DiskKind_DISK_KIND_SSD,
FreeBytes: 1024,
TotalBytes: 2048,
matchClusterCapacities(
t,
[]cells_storage.ClusterCapacity{
{
ZoneID: "zone-b",
CellID: "zone-b",
Kind: types.DiskKind_DISK_KIND_SSD,
FreeBytes: 1024,
TotalBytes: 2048,
},
},
},
),
deleteOlderThanExpectation,
).Return(nil).Once()

Expand Down Expand Up @@ -163,15 +193,18 @@ func TestCollectClusterCapacityFailureNbsReturnsError(t *testing.T) {
// Only the successful cell should be updated
storage.On("UpdateClusterCapacities",
mock.Anything, // ctx.
[]cells_storage.ClusterCapacity{
{
ZoneID: "zone-a",
CellID: "zone-a",
Kind: types.DiskKind_DISK_KIND_SSD,
FreeBytes: 1024,
TotalBytes: 2048,
matchClusterCapacities(
t,
[]cells_storage.ClusterCapacity{
{
ZoneID: "zone-a",
CellID: "zone-a",
Kind: types.DiskKind_DISK_KIND_SSD,
FreeBytes: 1024,
TotalBytes: 2048,
},
},
},
),
mock.Anything, // deleteOlderThan.
).Return(nil).Once()

Expand Down Expand Up @@ -232,28 +265,34 @@ func TestCollectClusterCapacityFailureStorageReturnsError(t *testing.T) {

storage.On("UpdateClusterCapacities",
mock.Anything, // ctx.
[]cells_storage.ClusterCapacity{
{
ZoneID: "zone-a",
CellID: "zone-a",
Kind: types.DiskKind_DISK_KIND_SSD,
FreeBytes: 1024,
TotalBytes: 2048,
matchClusterCapacities(
t,
[]cells_storage.ClusterCapacity{
{
ZoneID: "zone-a",
CellID: "zone-a",
Kind: types.DiskKind_DISK_KIND_SSD,
FreeBytes: 1024,
TotalBytes: 2048,
},
},
},
),
mock.Anything, // deleteOlderThan.
).Return(nil).Once()
storage.On("UpdateClusterCapacities",
mock.Anything,
[]cells_storage.ClusterCapacity{
{
ZoneID: "zone-a",
CellID: "zone-a-cell1",
Kind: types.DiskKind_DISK_KIND_SSD,
FreeBytes: 1024,
TotalBytes: 2048,
matchClusterCapacities(
t,
[]cells_storage.ClusterCapacity{
{
ZoneID: "zone-a",
CellID: "zone-a-cell1",
Kind: types.DiskKind_DISK_KIND_SSD,
FreeBytes: 1024,
TotalBytes: 2048,
},
},
},
),
mock.Anything, // deleteOlderThan.
).Return(assert.AnError).Once()

Expand Down Expand Up @@ -313,15 +352,18 @@ func TestCollectClusterCapacityOneCellHasAlreadyBeenProcessed(t *testing.T) {

storage.On("UpdateClusterCapacities",
mock.Anything, // ctx.
[]cells_storage.ClusterCapacity{
{
ZoneID: "zone-a",
CellID: "zone-a",
Kind: types.DiskKind_DISK_KIND_SSD,
FreeBytes: 1024,
TotalBytes: 2048,
matchClusterCapacities(
t,
[]cells_storage.ClusterCapacity{
{
ZoneID: "zone-a",
CellID: "zone-a",
Kind: types.DiskKind_DISK_KIND_SSD,
FreeBytes: 1024,
TotalBytes: 2048,
},
},
},
),
mock.Anything, // deleteOlderThan.
).Return(nil).Once()

Expand Down
58 changes: 19 additions & 39 deletions cloud/disk_manager/internal/pkg/cells/storage/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,42 +19,17 @@ type ClusterCapacity struct {
Kind types.DiskKind
TotalBytes uint64
FreeBytes uint64
}

////////////////////////////////////////////////////////////////////////////////

type clusterCapacityState struct {
ZoneID string
CellID string
Kind string
TotalBytes uint64
FreeBytes uint64
CreatedAt time.Time
}

////////////////////////////////////////////////////////////////////////////////

func (c *clusterCapacityState) toClusterCapacity() (ClusterCapacity, error) {
kind, err := common.DiskKindFromString(c.Kind)
if err != nil {
return ClusterCapacity{}, err
}

return ClusterCapacity{
ZoneID: c.ZoneID,
CellID: c.CellID,
Kind: kind,
TotalBytes: c.TotalBytes,
FreeBytes: c.FreeBytes,
}, nil
}

// Returns ydb entity of the node object.
func (c *clusterCapacityState) structValue() persistence.Value {
func (c *ClusterCapacity) structValue() persistence.Value {
return persistence.StructValue(
persistence.StructFieldValue("zone_id", persistence.UTF8Value(c.ZoneID)),
persistence.StructFieldValue("cell_id", persistence.UTF8Value(c.CellID)),
persistence.StructFieldValue("kind", persistence.UTF8Value(c.Kind)),
persistence.StructFieldValue("kind", persistence.UTF8Value(common.DiskKindToString(c.Kind))),
persistence.StructFieldValue("total_bytes", persistence.Uint64Value(c.TotalBytes)),
persistence.StructFieldValue("free_bytes", persistence.Uint64Value(c.FreeBytes)),
persistence.StructFieldValue("created_at", persistence.TimestampValue(c.CreatedAt)),
Expand All @@ -63,7 +38,7 @@ func (c *clusterCapacityState) structValue() persistence.Value {

////////////////////////////////////////////////////////////////////////////////

func clusterCapacityStateStructTypeString() string {
func clusterCapacityStructTypeString() string {
return `Struct<
zone_id: Utf8,
cell_id: Utf8,
Expand All @@ -73,7 +48,7 @@ func clusterCapacityStateStructTypeString() string {
created_at: Timestamp>`
}

func clusterCapacityStateTableDescription() persistence.CreateTableDescription {
func clusterCapacityTableDescription() persistence.CreateTableDescription {
return persistence.NewCreateTableDescription(
persistence.WithColumn("zone_id", persistence.Optional(persistence.TypeUTF8)),
persistence.WithColumn("cell_id", persistence.Optional(persistence.TypeUTF8)),
Expand All @@ -89,17 +64,27 @@ func clusterCapacityStateTableDescription() persistence.CreateTableDescription {

func scanClusterCapacity(
res persistence.Result,
) (capacity clusterCapacityState, err error) {
) (capacity ClusterCapacity, err error) {

var kind string
err = res.ScanNamed(
persistence.OptionalWithDefault("zone_id", &capacity.ZoneID),
persistence.OptionalWithDefault("cell_id", &capacity.CellID),
persistence.OptionalWithDefault("kind", &capacity.Kind),
persistence.OptionalWithDefault("kind", &kind),
persistence.OptionalWithDefault("total_bytes", &capacity.TotalBytes),
persistence.OptionalWithDefault("free_bytes", &capacity.FreeBytes),
persistence.OptionalWithDefault("created_at", &capacity.CreatedAt),
)
if err != nil {
return ClusterCapacity{}, err
}

capacity.Kind, err = common.DiskKindFromString(kind)
if err != nil {
return ClusterCapacity{}, err
}

return capacity, err
return capacity, nil
}

func scanClusterCapacities(
Expand All @@ -111,12 +96,7 @@ func scanClusterCapacities(

for res.NextResultSet(ctx) {
for res.NextRow() {
capacityState, err := scanClusterCapacity(res)
if err != nil {
return nil, err
}

capacity, err := capacityState.toClusterCapacity()
capacity, err := scanClusterCapacity(res)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -163,7 +143,7 @@ func CreateYDBTables(
ctx,
config.GetStorageFolder(),
"cluster_capacity",
clusterCapacityStateTableDescription(),
clusterCapacityTableDescription(),
dropUnusedColumns,
)
if err != nil {
Expand Down
Loading
Loading