TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 109 Pull requests 3 Projects Releases 2 Activity Actions

[#1704] metabase: Do not ignore errors by Delete
All checks were successful
Vulncheck / Vulncheck (push) Successful in 1m12s
Details
Pre-commit hooks / Pre-commit (push) Successful in 1m43s
Details
Build / Build Components (push) Successful in 1m54s
Details
Tests and linters / Run gofumpt (push) Successful in 3m31s
Details
Tests and linters / Tests (push) Successful in 3m37s
Details
Tests and linters / Lint (push) Successful in 3m44s
Details
Tests and linters / Staticcheck (push) Successful in 3m49s
Details
OCI image / Build container images (push) Successful in 4m39s
Details
Tests and linters / gopls check (push) Successful in 4m32s
Details
Tests and linters / Tests with -race (push) Successful in 7m16s
Details

Browse source 
Change-Id: Ie7b89071a007f53f55879ff9e7e0c25d24ad5dbf
Signed-off-by: Dmitrii Stepanov <d.stepanov@yadro.com>
This commit is contained in:
Dmitrii Stepanov 2025-04-03 10:09:05 +03:00
parent 2a6cdbdb72
commit 634de97509
Signed by: dstepanov-yadro
GPG key ID: 237AF1A763293BC0
1 changed files with 35 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -376,11 +376,12 @@ func parentLength(tx *bbolt.Tx, addr oid.Address) int {
return len(lst)
}
func delUniqueIndexItem(tx *bbolt.Tx, item namedBucketItem) {
func delUniqueIndexItem(tx *bbolt.Tx, item namedBucketItem) error {
bkt := tx.Bucket(item.name)
if bkt != nil {
_ = bkt.Delete(item.key) // ignore error, best effort there
return bkt.Delete(item.key)
}
return nil
}
func delListIndexItem(tx *bbolt.Tx, item namedBucketItem) error {
@ -405,19 +406,16 @@ func delListIndexItem(tx *bbolt.Tx, item namedBucketItem) error {
// if list empty, remove the key from <list> bucket
if len(lst) == 0 {
_ = bkt.Delete(item.key) // ignore error, best effort there
return nil
return bkt.Delete(item.key)
}
// if list is not empty, then update it
encodedLst, err := encodeList(lst)
if err != nil {
return nil // ignore error, best effort there
return err
}
_ = bkt.Put(item.key, encodedLst) // ignore error, best effort there
return nil
return bkt.Put(item.key, encodedLst)
}
func delFKBTIndexItem(tx *bbolt.Tx, item namedBucketItem) error {
@ -480,35 +478,47 @@ func delUniqueIndexes(tx *bbolt.Tx, obj *objectSDK.Object, isParent bool) error
return ErrUnknownObjectType
}
delUniqueIndexItem(tx, namedBucketItem{
if err := delUniqueIndexItem(tx, namedBucketItem{
name: bucketName,
key: objKey,
})
}); err != nil {
return err
}
} else {
delUniqueIndexItem(tx, namedBucketItem{
if err := delUniqueIndexItem(tx, namedBucketItem{
name: parentBucketName(cnr, bucketName),
key: objKey,
})
}); err != nil {
return err
}
}
delUniqueIndexItem(tx, namedBucketItem{ // remove from storage id index
if err := delUniqueIndexItem(tx, namedBucketItem{ // remove from storage id index
name: smallBucketName(cnr, bucketName),
key: objKey,
})
delUniqueIndexItem(tx, namedBucketItem{ // remove from root index
}); err != nil {
return err
}
if err := delUniqueIndexItem(tx, namedBucketItem{ // remove from root index
name: rootBucketName(cnr, bucketName),
key: objKey,
})
}); err != nil {
return err
}
if expEpoch, ok := hasExpirationEpoch(obj); ok {
delUniqueIndexItem(tx, namedBucketItem{
if err := delUniqueIndexItem(tx, namedBucketItem{
name: expEpochToObjectBucketName,
key: expirationEpochKey(expEpoch, cnr, addr.Object()),
})
delUniqueIndexItem(tx, namedBucketItem{
}); err != nil {
return err
}
if err := delUniqueIndexItem(tx, namedBucketItem{
name: objectToExpirationEpochBucketName(cnr, make([]byte, bucketKeySize)),
key: objKey,
})
}); err != nil {
return err
}
}
return nil
@ -535,10 +545,12 @@ func deleteECRelatedInfo(tx *bbolt.Tx, garbageBKT *bbolt.Bucket, obj *objectSDK.
// also drop EC parent root info if current EC chunk is the last one
if !hasAnyChunks {
delUniqueIndexItem(tx, namedBucketItem{
if err := delUniqueIndexItem(tx, namedBucketItem{
name: rootBucketName(cnr, make([]byte, bucketKeySize)),
key: objectKey(ech.Parent(), make([]byte, objectKeySize)),
})
}); err != nil {
return err
}
}
if ech.ParentSplitParentID() == nil {
@ -572,11 +584,10 @@ func deleteECRelatedInfo(tx *bbolt.Tx, garbageBKT *bbolt.Bucket, obj *objectSDK.
}
// drop split info
delUniqueIndexItem(tx, namedBucketItem{
return delUniqueIndexItem(tx, namedBucketItem{
name: rootBucketName(cnr, make([]byte, bucketKeySize)),
key: objectKey(*ech.ParentSplitParentID(), make([]byte, objectKeySize)),
})
return nil
}
func hasAnyECChunks(tx *bbolt.Tx, ech *objectSDK.ECHeader, cnr cid.ID) bool {