TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 101 Pull requests 6 Projects Releases 1 Activity Actions

Drop frostfs_node_engine_container_size_bytes and ..._count_total metric for removed containers #889

Merged
fyrchik merged 1 commit from dstepanov-yadro/frostfs-node:fix/drop_zero_metrics into master 2024-09-04 19:51:05 +00:00
Conversation 1 Commits 1 Files changed 11 +310 -38
dstepanov-yadro commented 2023-12-27 17:13:47 +00:00
Member
Copy link

Now metrics frostfs_node_engine_container_size_bytes and frostfs_node_engine_container_objects_total for removed container will be deleted after container removal.
Shard's GC checks every epoch metabase for containers with size = 0, checks container availability and size for this container on other shards, then deletes metric.

Also small refactoring for metabase inhume/delete: removed redundant fields, renamed counters.

Relates #864

Now metrics `frostfs_node_engine_container_size_bytes` and `frostfs_node_engine_container_objects_total` for removed container will be deleted after container removal. Shard's GC checks every epoch metabase for containers with size = 0, checks container availability and size for this container on other shards, then deletes metric. Also small refactoring for metabase inhume/delete: removed redundant fields, renamed counters. Relates #864
dstepanov-yadro reviewed 2023-12-27 17:16:45 +00:00
pkg/local_object_storage/engine/engine.go Outdated
@ -291,0 +307,4 @@
func (s *containerSource) IsContainerAvailable(ctx context.Context, id cid.ID) (bool, error) {
if s == nil || s.cs == nil {
return true, nil
dstepanov-yadro commented 2023-12-27 17:16:45 +00:00
Author
Member
Copy link

By default all containers are available

By default all containers are available
dstepanov-yadro force-pushed fix/drop_zero_metrics from 6464d55743 to c516e58eaa 2023-12-27 17:23:40 +00:00 Compare
dstepanov-yadro requested review from storage-core-committers 2023-12-27 17:47:23 +00:00
dstepanov-yadro requested review from storage-core-developers 2023-12-27 17:47:24 +00:00
dstepanov-yadro changed title from Drop frostfs_node_engine_container_size_bytes metric for removed containers to Drop frostfs_node_engine_container_size_bytes and ..._count_total metric for removed containers 2023-12-28 09:29:21 +00:00
elebedeva reviewed 2023-12-28 13:46:53 +00:00
pkg/local_object_storage/engine/engine.go Outdated
@ -291,0 +302,4 @@
}
type containerSource struct {
cs container.Source
elebedeva commented 2023-12-28 13:46:53 +00:00
Member
Copy link

Is it necessary to wrap container.Source in a new type?

Is it necessary to wrap ```container.Source``` in a new type?
👍 1
dstepanov-yadro commented 2023-12-29 11:29:29 +00:00
Author
Member
Copy link

Yes. container.Source is an interface, but atomic.Value doesn't support changing type. From docs: All calls to CompareAndSwap for a given Value must use values of the same concrete type.

Yes. `container.Source` is an interface, but `atomic.Value` doesn't support changing type. From docs: `All calls to CompareAndSwap for a given Value must use values of the same concrete type. `
👍 1
elebedeva marked this conversation as resolved
fyrchik reviewed 2023-12-29 09:51:07 +00:00
pkg/local_object_storage/engine/engine.go Outdated
@ -291,0 +320,4 @@
if err == nil {
return true, nil
}
if client.IsErrContainerNotFound(err) {
fyrchik commented 2023-12-29 09:41:45 +00:00
Owner
Copy link

Get is not enough, there should be a DeletionInfo somewhere.

`Get` is not enough, there should be a `DeletionInfo` somewhere.
dstepanov-yadro commented 2023-12-29 11:43:28 +00:00
Author
Member
Copy link

Fixed

Fixed
fyrchik marked this conversation as resolved
pkg/local_object_storage/engine/inhume.go Outdated
@ -262,0 +417,4 @@
}
}
func (e *StorageEngine) selectNonExistedIDs(ctx context.Context, ids []cid.ID) (map[cid.ID]struct{}, error) {
fyrchik commented 2023-12-29 09:44:58 +00:00
Owner
Copy link

nonExistent?

`nonExistent`?
dstepanov-yadro commented 2023-12-29 11:43:40 +00:00
Author
Member
Copy link

Fixed

Fixed
fyrchik marked this conversation as resolved
pkg/local_object_storage/metabase/counter.go Outdated
@ -483,0 +647,4 @@
return metaerr.Wrap(err)
}
// ZeroCountContainers returns containers with count = 0.
fyrchik commented 2023-12-29 09:50:42 +00:00
Owner
Copy link

It is not obvious, what count is from the comment.

It is not obvious, what `count` is from the comment.
dstepanov-yadro commented 2023-12-29 11:44:02 +00:00
Author
Member
Copy link

Fixed

Fixed
fyrchik marked this conversation as resolved
dstepanov-yadro force-pushed fix/drop_zero_metrics from 80a25a549d to 0cd1bc08fe 2023-12-29 11:40:13 +00:00 Compare
dstepanov-yadro force-pushed fix/drop_zero_metrics from 0cd1bc08fe to ef8328176e 2024-01-09 07:00:05 +00:00 Compare
achuprov approved these changes 2024-01-09 08:49:00 +00:00
achuprov reviewed 2024-01-09 08:51:04 +00:00
pkg/local_object_storage/engine/inhume.go Outdated
@ -262,0 +271,4 @@
return
}
if len(idMap) == 0 {
achuprov commented 2024-01-09 08:51:04 +00:00
Member
Copy link

Is this check really necessary?

Is this check really necessary?
dstepanov-yadro commented 2024-01-09 09:02:14 +00:00
Author
Member
Copy link

Yes: container may be empty, but still exist

Yes: container may be empty, but still exist
achuprov commented 2024-01-09 08:51:57 +00:00
Member
Copy link

Accidentally approved the PR.

Accidentally approved the PR.
dstepanov-yadro force-pushed fix/drop_zero_metrics from ef8328176e to 9bc8c45e74 2024-01-09 09:36:15 +00:00 Compare
acid-ant approved these changes 2024-01-09 12:34:12 +00:00
fyrchik reviewed 2024-01-09 15:45:17 +00:00
pkg/local_object_storage/engine/engine.go Outdated
@ -291,0 +305,4 @@
cs container.Source
}
func (s *containerSource) IsContainerAvailable(ctx context.Context, id cid.ID) (bool, error) {
fyrchik commented 2024-01-09 15:36:36 +00:00
Owner
Copy link

WasRemoved arguably serves the same purpose, but with inverted result. Isn't it enough? Like we only want to remove metric if WasRemoved returns true, nil.

`WasRemoved` arguably serves the same purpose, but with inverted result. Isn't it enough? Like we _only_ want to remove metric if `WasRemoved` returns `true, nil`.
dstepanov-yadro commented 2024-01-10 07:27:36 +00:00
Author
Member
Copy link

Fixed

Fixed
fyrchik marked this conversation as resolved
pkg/local_object_storage/metabase/counter.go Outdated
@ -483,0 +693,4 @@
return result, nil
}
func (db *DB) DeleteContainerCount(ctx context.Context, id cid.ID) error {
fyrchik commented 2024-01-09 15:45:08 +00:00
Owner
Copy link

Why are DeleteContainerCount and DeleteContainerSize separate methods? It seems they become 0 simultaneously and are removed together too.

Why are `DeleteContainerCount` and `DeleteContainerSize` separate methods? It seems they become 0 simultaneously and are removed together too.
dstepanov-yadro commented 2024-01-09 15:50:34 +00:00
Author
Member
Copy link

Nope, count may have non zero phy counter, but size (it is logical size) is already 0.

Nope, count may have non zero `phy` counter, but size (it is logical size) is already 0.
fyrchik marked this conversation as resolved
dstepanov-yadro force-pushed fix/drop_zero_metrics from 9bc8c45e74 to aec318b414 2024-01-10 07:26:26 +00:00 Compare
fyrchik approved these changes 2024-01-10 07:32:54 +00:00
pkg/local_object_storage/engine/engine.go Outdated
@ -219,2 +221,4 @@
rebuildWorkersCount uint32
containerSource atomic.Value // type containerSource
fyrchik commented 2024-01-10 07:32:07 +00:00
Owner
Copy link

Btw, why is it not atomic.Pointer?

Btw, why is it not `atomic.Pointer`?
dstepanov-yadro commented 2024-01-10 07:46:09 +00:00
Author
Member
Copy link

old school, fixed.

old school, fixed.
dstepanov-yadro force-pushed fix/drop_zero_metrics from aec318b414 to 4b8b4da681 2024-01-10 07:45:42 +00:00 Compare
fyrchik approved these changes 2024-01-10 08:22:50 +00:00
fyrchik merged commit 4b8b4da681 into master 2024-01-10 08:33:52 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
achuprov
acid-ant
fyrchik
Labels
Clear labels   
P0

Highest

  
P1

High

  
P2

Medium

  
P3

Low

  
badger

Badger DB related issues

  
frostfs-adm

   
frostfs-cli

   
frostfs-ir

   
frostfs-lens

   
frostfs-node

   
good first issue

Good for newcomers

  
triage
  
Infrastructure

Infrastructure, Automation, CI/CD or DevOps related stuff

  
blocked

The issue or PR is blocked by something

  
bug

Something is not working

  
config

Configuration format update or breaking change

  
discussion

Talking about something in order to reach a decision or to exchange ideas

  
documentation

Documentation related

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
go

Language features adoption

  
help wanted

Extra attention is needed

  
internal

   
invalid

Something is wrong

  
kludge

This is a kludge and we know it

  
observability

Related to metrics, tracing and logs

  
perfomance

Perfomance related

  
question

More information is needed

  
refactoring

Refactoring

  
wontfix

This won't be fixed

No labels
P0
P1
P2
P3
badger
frostfs-adm
frostfs-cli
frostfs-ir
frostfs-lens
frostfs-node
good first issue
triage
Infrastructure
blocked
bug
config
discussion
documentation
duplicate
enhancement
go
help wanted
internal
invalid
kludge
observability
perfomance
question
refactoring
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
5 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: TrueCloudLab/frostfs-node#889
No description provided.
Delete branch "dstepanov-yadro/frostfs-node:fix/drop_zero_metrics"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?