TrueCloudLab/frostfs-node
18
1
Fork 27
Code Issues 91 Pull requests 8 Projects Releases 1 Activity Actions

[#1385] metabase: Use Batch for delete-related operations
All checks were successful
DCO action / DCO (pull_request) Successful in 1m3s
Details
Tests and linters / Run gofumpt (pull_request) Successful in 1m9s
Details
Vulncheck / Vulncheck (pull_request) Successful in 1m26s
Details
Pre-commit hooks / Pre-commit (pull_request) Successful in 2m13s
Details
Build / Build Components (pull_request) Successful in 2m21s
Details
Tests and linters / Staticcheck (pull_request) Successful in 2m39s
Details
Tests and linters / gopls check (pull_request) Successful in 2m41s
Details
Tests and linters / Lint (pull_request) Successful in 3m27s
Details
Tests and linters / Tests (pull_request) Successful in 4m14s
Details
Tests and linters / Tests with -race (pull_request) Successful in 5m55s
Details

Browse source 
Signed-off-by: Dmitrii Stepanov <d.stepanov@yadro.com>
This commit is contained in:
Dmitrii Stepanov 2024-09-19 17:00:58 +03:00
parent 61d5e140e0
commit a193465421
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/local_object_storage/metabase/counter.go
View file

@ -654,7 +654,7 @@ func (db *DB) DeleteContainerSize(ctx context.Context, id cid.ID) error {
return ErrReadOnlyMode return ErrReadOnlyMode
} }
err := db.boltDB.Update(func(tx *bbolt.Tx) error { err := db.boltDB.Batch(func(tx *bbolt.Tx) error {
b := tx.Bucket(containerVolumeBucketName) b := tx.Bucket(containerVolumeBucketName)
key := make([]byte, cidSize) key := make([]byte, cidSize)
@ -737,7 +737,7 @@ func (db *DB) DeleteContainerCount(ctx context.Context, id cid.ID) error {
return ErrReadOnlyMode return ErrReadOnlyMode
} }
err := db.boltDB.Update(func(tx *bbolt.Tx) error { err := db.boltDB.Batch(func(tx *bbolt.Tx) error {
b := tx.Bucket(containerCounterBucketName) b := tx.Bucket(containerCounterBucketName)
key := make([]byte, cidSize) key := make([]byte, cidSize)

2
pkg/local_object_storage/metabase/delete.go
View file

@ -112,7 +112,7 @@ func (db *DB) Delete(ctx context.Context, prm DeletePrm) (DeleteRes, error) {
var err error var err error
var res DeleteRes var res DeleteRes
err = db.boltDB.Update(func(tx *bbolt.Tx) error { err = db.boltDB.Batch(func(tx *bbolt.Tx) error {
res, err = db.deleteGroup(tx, prm.addrs) res, err = db.deleteGroup(tx, prm.addrs)
return err return err
}) })

2
pkg/local_object_storage/metabase/graveyard.go
View file

@ -282,7 +282,7 @@ func (db *DB) DropGraves(ctx context.Context, tss []TombstonedObject) error {
buf := make([]byte, addressKeySize) buf := make([]byte, addressKeySize)
return db.boltDB.Update(func(tx *bbolt.Tx) error { return db.boltDB.Batch(func(tx *bbolt.Tx) error {
bkt := tx.Bucket(graveyardBucketName) bkt := tx.Bucket(graveyardBucketName)
if bkt == nil { if bkt == nil {
return nil return nil

2
pkg/local_object_storage/metabase/inhume.go
View file

@ -181,7 +181,7 @@ func (db *DB) Inhume(ctx context.Context, prm InhumePrm) (InhumeRes, error) {
inhumedByCnrID: make(map[cid.ID]ObjectCounters), inhumedByCnrID: make(map[cid.ID]ObjectCounters),
} }
currEpoch := db.epochState.CurrentEpoch() currEpoch := db.epochState.CurrentEpoch()
err := db.boltDB.Update(func(tx *bbolt.Tx) error { err := db.boltDB.Batch(func(tx *bbolt.Tx) error {
return db.inhumeTx(tx, currEpoch, prm, &res) return db.inhumeTx(tx, currEpoch, prm, &res)
}) })
success = err == nil success = err == nil

4
pkg/local_object_storage/metabase/lock.go
View file

@ -78,7 +78,7 @@ func (db *DB) lockInternal(locked []oid.ID, cnr cid.ID, locker oid.ID) error {
} }
key := make([]byte, cidSize) key := make([]byte, cidSize)
return metaerr.Wrap(db.boltDB.Update(func(tx *bbolt.Tx) error { return metaerr.Wrap(db.boltDB.Batch(func(tx *bbolt.Tx) error {
if firstIrregularObjectType(tx, cnr, bucketKeysLocked...) != objectSDK.TypeRegular { if firstIrregularObjectType(tx, cnr, bucketKeysLocked...) != objectSDK.TypeRegular {
return logicerr.Wrap(new(apistatus.LockNonRegularObject)) return logicerr.Wrap(new(apistatus.LockNonRegularObject))
} }
@ -143,7 +143,7 @@ func (db *DB) FreeLockedBy(lockers []oid.Address) ([]oid.Address, error) {
var unlockedObjects []oid.Address var unlockedObjects []oid.Address
if err := db.boltDB.Update(func(tx *bbolt.Tx) error { if err := db.boltDB.Batch(func(tx *bbolt.Tx) error {
for i := range lockers { for i := range lockers {
unlocked, err := freePotentialLocks(tx, lockers[i].Container(), lockers[i].Object()) unlocked, err := freePotentialLocks(tx, lockers[i].Container(), lockers[i].Object())
if err != nil { if err != nil {