From 634de975094b8f83b5b9eeff15b7fd2bfdd6f1fc Mon Sep 17 00:00:00 2001
From: Dmitrii Stepanov <d.stepanov@yadro.com>
Date: Thu, 3 Apr 2025 10:09:05 +0300
Subject: [PATCH] [#1704] metabase: Do not ignore errors by Delete

Change-Id: Ie7b89071a007f53f55879ff9e7e0c25d24ad5dbf
Signed-off-by: Dmitrii Stepanov <d.stepanov@yadro.com>
---
 pkg/local_object_storage/metabase/delete.go | 59 ++++++++++++---------
 1 file changed, 35 insertions(+), 24 deletions(-)

diff --git a/pkg/local_object_storage/metabase/delete.go b/pkg/local_object_storage/metabase/delete.go
index d338e228f..cf1d563e9 100644
--- a/pkg/local_object_storage/metabase/delete.go
+++ b/pkg/local_object_storage/metabase/delete.go
@@ -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 {