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

Fix blobovnizca data size counter #612

Merged
fyrchik merged 3 commits from dstepanov-yadro/frostfs-node:fix/blobovnizca_perf into master 2023-08-17 19:17:37 +00:00
Conversation 0 Commits 3 Files changed 12 +162 -112
dstepanov-yadro commented 2023-08-15 13:58:27 +00:00
Member
Copy link

Relates #602

Fix blobovnicza counters:

  • Add Init call to initialize size counter.

  • Previously, to determine the blobovnizca size, a logical size was added to the physical size. Now only the logical size is used. The size is calculated as multiplying the number of records by the upper bound of the bucket.

  • blobovnizca.Close can be called multiple times, so I added a mutex to avoid changing metrics and counters multiple times.

  • I changed the name of the size metric, since this metric does not correspond to the total size of the tree, but to the size of open blobovnizcas.

Relates #602 Fix blobovnicza counters: - Add `Init` call to initialize size counter. - Previously, to determine the blobovnizca size, a logical size was added to the physical size. Now only the logical size is used. The size is calculated as multiplying the number of records by the upper bound of the bucket. - `blobovnizca.Close` can be called multiple times, so I added a mutex to avoid changing metrics and counters multiple times. - I changed the name of the `size` metric, since this metric does not correspond to the total size of the tree, but to the size of open blobovnizcas.
dstepanov-yadro force-pushed fix/blobovnizca_perf from 32d198b316 to 77aad284d0 2023-08-15 15:22:37 +00:00 Compare
dstepanov-yadro force-pushed fix/blobovnizca_perf from 77aad284d0 to e1c2bb259e 2023-08-16 08:16:17 +00:00 Compare
dstepanov-yadro reviewed 2023-08-16 10:13:43 +00:00
pkg/local_object_storage/blobovnicza/control.go Outdated
@ -75,0 +102,4 @@
func (b *Blobovnicza) initializeSize() error {
var size uint64
err := b.boltDB.View(func(tx *bbolt.Tx) error {
return b.iterateAllBuckets(tx, func(lower, upper uint64, b *bbolt.Bucket) (bool, error) {
dstepanov-yadro commented 2023-08-16 10:13:43 +00:00
Author
Member
Copy link

There should be 3 buckets for objSizeLimit=128KB: 0 - 32KB, 32KB-64KB, 64KB - 128KB.

There should be 3 buckets for `objSizeLimit=128KB`: 0 - 32KB, 32KB-64KB, 64KB - 128KB.
dstepanov-yadro reviewed 2023-08-16 10:20:34 +00:00
pkg/local_object_storage/blobovnicza/delete.go Outdated
@ -49,3 +52,3 @@
err := b.boltDB.Update(func(tx *bbolt.Tx) error {
return b.iterateBuckets(tx, func(lower, upper uint64, buck *bbolt.Bucket) (bool, error) {
return b.iterateAllBuckets(tx, func(lower, upper uint64, buck *bbolt.Bucket) (bool, error) {
dstepanov-yadro commented 2023-08-16 10:20:34 +00:00
Author
Member
Copy link

Scenario: I set the maximum size of the object to 1MB, saved the object, changed the maximum size to 128KB, then I'm trying to delete it, but the corresponding bucket is not found because of new limit.

After this fix all bucket will be iterated, not only limited by object size.

Scenario: I set the maximum size of the object to 1MB, saved the object, changed the maximum size to 128KB, then I'm trying to delete it, but the corresponding bucket is not found because of new limit. After this fix all bucket will be iterated, not only limited by object size.
dstepanov-yadro changed title from WIP: Blobovnizca performance to Fix blobovnizca data size counter 2023-08-16 10:22:52 +00:00
dstepanov-yadro requested review from storage-core-committers 2023-08-16 10:22:57 +00:00
dstepanov-yadro requested review from storage-core-developers 2023-08-16 10:22:57 +00:00
dstepanov-yadro force-pushed fix/blobovnizca_perf from 710da5cf93 to 850f79361b 2023-08-16 10:24:12 +00:00 Compare
fyrchik approved these changes 2023-08-16 10:35:16 +00:00
pkg/local_object_storage/blobovnicza/control.go Outdated
@ -16,2 +16,4 @@
// If the database file does not exist, it will be created automatically.
// If blobovnizca is already open, does nothing.
func (b *Blobovnicza) Open() error {
b.controlMtx.Lock()
fyrchik commented 2023-08-16 10:32:24 +00:00
Owner
Copy link

Open is usually something done once after creation, do we have any place where we reuse the Blobovnicza struct?

`Open` is usually something done once after creation, do we have any place where we reuse the `Blobovnicza` struct?
dstepanov-yadro commented 2023-08-16 11:35:18 +00:00
Author
Member
Copy link

No, here we check 'opened' flag for consistency with Init and Close

No, here we check 'opened' flag for consistency with `Init` and `Close`
fyrchik marked this conversation as resolved
pkg/local_object_storage/blobovnicza/control.go Outdated
@ -51,0 +60,4 @@
defer b.controlMtx.Unlock()
if !b.opened {
return errors.New("blobovnizca is not open")
fyrchik commented 2023-08-16 10:32:44 +00:00
Owner
Copy link

s/open/opened/

s/open/opened/
ale64bit commented 2023-08-16 11:08:43 +00:00
Member
Copy link

"open" seems fine to me as well. As in, "the door is open".

"open" seems fine to me as well. As in, "the door is open".
👍 1
fyrchik marked this conversation as resolved
pkg/local_object_storage/blobovnicza/control.go Outdated
@ -92,2 +117,4 @@
// Close releases all internal database resources.
//
// If blobovnizca is already close, does nothing.
fyrchik commented 2023-08-16 10:33:20 +00:00
Owner
Copy link

s/close/closed/

s/close/closed/
dstepanov-yadro commented 2023-08-16 11:54:07 +00:00
Author
Member
Copy link

fixed

fixed
fyrchik marked this conversation as resolved
dstepanov-yadro force-pushed fix/blobovnizca_perf from 850f79361b to 6f69dcbb0d 2023-08-16 11:54:06 +00:00 Compare
dstepanov-yadro force-pushed fix/blobovnizca_perf from 6f69dcbb0d to c0f3fb332f 2023-08-16 12:24:56 +00:00 Compare
acid-ant approved these changes 2023-08-16 12:53:19 +00:00
fyrchik merged commit 10e63537b2 into master 2023-08-17 19:17:37 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
fyrchik
acid-ant
TrueCloudLab/storage-core-developers
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
4 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#612
No description provided.
Delete branch "dstepanov-yadro/frostfs-node:fix/blobovnizca_perf"

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?