[#1839] engine: Handle Inhume errors properly

If shard is in read-only or degraded mode, there is no need to increase
error counter.

Signed-off-by: Evgenii Stratonikov <evgeniy@morphbits.ru>

CHANGELOG.md

@@ -28,6 +28,7 @@ Changelog for NeoFS Node
 - Storage nodes could enter the network with any state (#1796)
 - Missing check of new state value in `ControlService.SetNetmapStatus` (#1797)
 - Correlation of object session to request (#1420)
+- Do not increase error counter in `engine.Inhume` if shard is read-only (#1839)
 
 ### Removed
 - Remove WIF and NEP2 support in `neofs-cli`'s --wallet flag (#1128)

pkg/local_object_storage/engine/delete.go

@@ -7,6 +7,7 @@ import (
 	apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status"
 	objectSDK "github.com/nspcc-dev/neofs-sdk-go/object"
 	oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
+	"go.uber.org/zap"
 )
 
 // DeletePrm groups the parameters of Delete operation.
@@ -88,7 +89,13 @@ func (e *StorageEngine) delete(prm DeletePrm) (DeleteRes, error) {
 
 		_, err = sh.Inhume(shPrm)
 		if err != nil {
+			if errors.Is(err, shard.ErrReadOnlyMode) || errors.Is(err, shard.ErrDegradedMode) {
+				e.log.Warn("could not inhume object in shard",
+					zap.Stringer("shard_id", sh.ID()),
+					zap.String("error", err.Error()))
+			} else {
 				e.reportShardError(sh, "could not inhume object in shard", err)
+			}
 
 			locked.is = errors.As(err, &locked.err)
 

pkg/local_object_storage/engine/inhume.go

@@ -85,16 +85,15 @@ func (e *StorageEngine) inhume(prm InhumePrm) (InhumeRes, error) {
 			shPrm.MarkAsGarbage(prm.addrs[i])
 		}
 
-		switch e.inhumeAddr(prm.addrs[i], shPrm, true) {
+		ok, err := e.inhumeAddr(prm.addrs[i], shPrm, true)
-		case 2:
+		if err != nil {
-			return InhumeRes{}, meta.ErrLockObjectRemoval
+			return InhumeRes{}, err
-		case 1:
+		}
-			return InhumeRes{}, apistatus.ObjectLocked{}
+		if !ok {
-		case 0:
+			ok, err := e.inhumeAddr(prm.addrs[i], shPrm, false)
-			switch e.inhumeAddr(prm.addrs[i], shPrm, false) {
+			if err != nil {
-			case 1:
+				return InhumeRes{}, err
-				return InhumeRes{}, apistatus.ObjectLocked{}
+			} else if !ok {
-			case 0:
 				return InhumeRes{}, errInhumeFailure
 			}
 		}
@@ -103,15 +102,13 @@ func (e *StorageEngine) inhume(prm InhumePrm) (InhumeRes, error) {
 	return InhumeRes{}, nil
 }
 
-// Returns:
+// Returns ok if object was inhumed during this invocation or before.
-//   - 0: fail
+func (e *StorageEngine) inhumeAddr(addr oid.Address, prm shard.InhumePrm, checkExists bool) (bool, error) {
-//   - 1: object locked
-//   - 2: lock object removal
-//   - 3: ok
-func (e *StorageEngine) inhumeAddr(addr oid.Address, prm shard.InhumePrm, checkExists bool) (status uint8) {
 	root := false
 	var errLocked apistatus.ObjectLocked
 	var existPrm shard.ExistsPrm
+	var retErr error
+	var ok bool
 
 	e.iterateOverSortedShards(addr, func(_ int, sh hashedShard) (stop bool) {
 		defer func() {
@@ -128,7 +125,7 @@ func (e *StorageEngine) inhumeAddr(addr oid.Address, prm shard.InhumePrm, checkE
 			if err != nil {
 				if shard.IsErrRemoved(err) || shard.IsErrObjectExpired(err) {
 					// inhumed once - no need to be inhumed again
-					status = 3
+					ok = true
 					return true
 				}
 
@@ -148,10 +145,13 @@ func (e *StorageEngine) inhumeAddr(addr oid.Address, prm shard.InhumePrm, checkE
 		if err != nil {
 			switch {
 			case errors.As(err, &errLocked):
-				status = 1
+				retErr = apistatus.ObjectLocked{}
 				return true
 			case errors.Is(err, shard.ErrLockObjectRemoval):
-				status = 2
+				retErr = meta.ErrLockObjectRemoval
+				return true
+			case errors.Is(err, shard.ErrReadOnlyMode) || errors.Is(err, shard.ErrDegradedMode):
+				retErr = err
 				return true
 			}
 
@@ -159,12 +159,11 @@ func (e *StorageEngine) inhumeAddr(addr oid.Address, prm shard.InhumePrm, checkE
 			return false
 		}
 
-		status = 3
+		ok = true
-
 		return true
 	})
 
-	return
+	return ok, retErr
 }
 
 func (e *StorageEngine) processExpiredTombstones(ctx context.Context, addrs []meta.TombstonedObject) {