shard: do not try to resync API 2.18+ objects using payload

Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>

Author: carpawell

pkg/local_object_storage/shard/control.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	"github.com/nspcc-dev/neofs-node/pkg/core/object"
+	"github.com/nspcc-dev/neofs-node/pkg/core/version"
 	meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase"
 	"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode"
 	apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status"
@@ -191,54 +192,56 @@ func (s *Shard) resyncObjectHandler(addr oid.Address, data []byte) error {
 		return nil
 	}
 
-	// nolint: exhaustive
-	switch obj.Type() {
-	case objectSDK.TypeTombstone:
-		tombstone := objectSDK.NewTombstone()
-		exp, err := object.Expiration(*obj)
-		if err != nil && !errors.Is(err, object.ErrNoExpiration) {
-			return fmt.Errorf("tombstone's expiration: %w", err)
-		}
+	if !version.SysObjTargetShouldBeInHeader(obj.Version()) {
+		// nolint: exhaustive
+		switch obj.Type() {
+		case objectSDK.TypeTombstone:
+			tombstone := objectSDK.NewTombstone()
+			exp, err := object.Expiration(*obj)
+			if err != nil && !errors.Is(err, object.ErrNoExpiration) {
+				return fmt.Errorf("tombstone's expiration: %w", err)
+			}
 
-		if err := tombstone.Unmarshal(obj.Payload()); err != nil {
-			return fmt.Errorf("could not unmarshal tombstone content: %w", err)
-		}
+			if err := tombstone.Unmarshal(obj.Payload()); err != nil {
+				return fmt.Errorf("could not unmarshal tombstone content: %w", err)
+			}
 
-		tombAddr := object.AddressOf(obj)
-		memberIDs := tombstone.Members()
-		tombMembers := make([]oid.Address, 0, len(memberIDs))
+			tombAddr := object.AddressOf(obj)
+			memberIDs := tombstone.Members()
+			tombMembers := make([]oid.Address, 0, len(memberIDs))
 
-		for i := range memberIDs {
-			a := tombAddr
-			a.SetObject(memberIDs[i])
+			for i := range memberIDs {
+				a := tombAddr
+				a.SetObject(memberIDs[i])
 
-			tombMembers = append(tombMembers, a)
-		}
+				tombMembers = append(tombMembers, a)
+			}
 
-		_, _, err = s.metaBase.Inhume(tombAddr, exp, false, tombMembers...)
-		if err != nil {
-			if errors.Is(err, apistatus.ErrObjectLocked) {
-				// if we are trying to inhume locked object, likely we are doing
-				// something wrong and it should not stop resynchronisation
-				s.log.Warn("inhuming locked objects",
-					zap.Stringer("TS_address", tombAddr),
-					zap.Stringers("targets", memberIDs))
-				return nil
+			_, _, err = s.metaBase.Inhume(tombAddr, exp, false, tombMembers...)
+			if err != nil {
+				if errors.Is(err, apistatus.ErrObjectLocked) {
+					// if we are trying to inhume locked object, likely we are doing
+					// something wrong and it should not stop resynchronisation
+					s.log.Warn("inhuming locked objects",
+						zap.Stringer("TS_address", tombAddr),
+						zap.Stringers("targets", memberIDs))
+					return nil
+				}
+				return fmt.Errorf("could not inhume [%s] objects: %w", oidsToString(memberIDs), err)
+			}
+		case objectSDK.TypeLock:
+			var lock objectSDK.Lock
+			if err := lock.Unmarshal(obj.Payload()); err != nil {
+				return fmt.Errorf("could not unmarshal lock content: %w", err)
 			}
-			return fmt.Errorf("could not inhume [%s] objects: %w", oidsToString(memberIDs), err)
-		}
-	case objectSDK.TypeLock:
-		var lock objectSDK.Lock
-		if err := lock.Unmarshal(obj.Payload()); err != nil {
-			return fmt.Errorf("could not unmarshal lock content: %w", err)
-		}
 
-		locked := make([]oid.ID, lock.NumberOfMembers())
-		lock.ReadMembers(locked)
+			locked := make([]oid.ID, lock.NumberOfMembers())
+			lock.ReadMembers(locked)
 
-		err := s.metaBase.Lock(obj.GetContainerID(), obj.GetID(), locked)
-		if err != nil {
-			return fmt.Errorf("could not lock [%s] objects: %w", oidsToString(locked), err)
+			err := s.metaBase.Lock(obj.GetContainerID(), obj.GetID(), locked)
+			if err != nil {
+				return fmt.Errorf("could not lock [%s] objects: %w", oidsToString(locked), err)
+			}
 		}
 	}
 

pkg/local_object_storage/shard/control_test.go

@@ -18,6 +18,7 @@ import (
 	oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
 	oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test"
 	objecttest "github.com/nspcc-dev/neofs-sdk-go/object/test"
+	"github.com/nspcc-dev/neofs-sdk-go/version"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
 )
@@ -150,6 +151,7 @@ func TestResyncMetabase(t *testing.T) {
 	require.NoError(t, sh.Init())
 
 	const objNum = 10
+	oldVersion := version.New(2, 17)
 
 	mObjs := make(map[string]objAddr)
 	locked := make([]oid.ID, 1, 2)
@@ -183,6 +185,7 @@ func TestResyncMetabase(t *testing.T) {
 
 	tombObj := objecttest.Object()
 	tombObj.SetType(objectSDK.TypeTombstone)
+	tombObj.SetVersion(&oldVersion)
 
 	tombstone := objecttest.Tombstone()
 
@@ -215,6 +218,7 @@ func TestResyncMetabase(t *testing.T) {
 	lock.WriteMembers(locked)
 
 	lockObj := objecttest.Object()
+	lockObj.SetVersion(&oldVersion)
 	lockObj.SetContainerID(cnrLocked)
 	lockObj.WriteLock(lock)