cmd/frostfs-node/cache.go

@@ -142,8 +142,7 @@ func (c *lruNetCache) get(key uint64) (*netmapSDK.NetMap, error) {
 // wrapper over TTL cache of values read from the network
 // that implements container storage.
 type ttlContainerStorage struct {
-	containerCache *ttlNetCache[cid.ID, *container.Container]
+	*ttlNetCache[cid.ID, *container.Container]
-	delInfoCache   *ttlNetCache[cid.ID, *container.DelInfo]
 }
 
 func newCachedContainerStorage(v container.Source, ttl time.Duration) ttlContainerStorage {
@@ -152,31 +151,18 @@ func newCachedContainerStorage(v container.Source, ttl time.Duration) ttlContain
 	lruCnrCache := newNetworkTTLCache(containerCacheSize, ttl, func(id cid.ID) (*container.Container, error) {
 		return v.Get(id)
 	})
-	lruDelInfoCache := newNetworkTTLCache(containerCacheSize, ttl, func(id cid.ID) (*container.DelInfo, error) {
-		return v.DeletionInfo(id)
-	})
 
-	return ttlContainerStorage{
+	return ttlContainerStorage{lruCnrCache}
-		containerCache: lruCnrCache,
-		delInfoCache:   lruDelInfoCache,
-	}
 }
 
 func (s ttlContainerStorage) handleRemoval(cnr cid.ID) {
-	s.containerCache.set(cnr, nil, new(apistatus.ContainerNotFound))
+	s.set(cnr, nil, new(apistatus.ContainerNotFound))
-
-	// The removal invalidates possibly stored error response.
-	s.delInfoCache.remove(cnr)
 }
 
 // Get returns container value from the cache. If value is missing in the cache
 // or expired, then it returns value from side chain and updates the cache.
 func (s ttlContainerStorage) Get(cnr cid.ID) (*container.Container, error) {
-	return s.containerCache.get(cnr)
+	return s.get(cnr)
-}
-
-func (s ttlContainerStorage) DeletionInfo(cnr cid.ID) (*container.DelInfo, error) {
-	return s.delInfoCache.get(cnr)
 }
 
 type ttlEACLStorage struct {

cmd/frostfs-node/container.go

@@ -113,7 +113,7 @@ func configureEACLAndContainerSources(c *cfg, client *cntClient.Client, cnrSrc c
 		c.cfgObject.eaclSource = eACLFetcher
 		cnrRdr.eacl = eACLFetcher
 		c.cfgObject.cnrSource = cnrSrc
-		cnrRdr.src = cnrSrc
+		cnrRdr.get = cnrSrc
 		cnrRdr.lister = client
 	} else {
 		// use RPC node as source of Container contract items (with caching)
@@ -131,7 +131,7 @@ func configureEACLAndContainerSources(c *cfg, client *cntClient.Client, cnrSrc c
 			cnr, err := cnrSrc.Get(ev.ID)
 			if err == nil {
 				cachedContainerLister.update(cnr.Value.Owner(), ev.ID, true)
-				cachedContainerStorage.containerCache.set(ev.ID, cnr, nil)
+				cachedContainerStorage.set(ev.ID, cnr, nil)
 			} else {
 				// unlike removal, we expect successful receive of the container
 				// after successful creation, so logging can be useful
@@ -159,6 +159,7 @@ func configureEACLAndContainerSources(c *cfg, client *cntClient.Client, cnrSrc c
 			}
 
 			cachedContainerStorage.handleRemoval(ev.ID)
+
 			c.log.Debug(logs.FrostFSNodeContainerRemovalEventsReceipt,
 				zap.Stringer("id", ev.ID),
 			)
@@ -169,7 +170,7 @@ func configureEACLAndContainerSources(c *cfg, client *cntClient.Client, cnrSrc c
 
 		cnrRdr.lister = cachedContainerLister
 		cnrRdr.eacl = c.cfgObject.eaclSource
-		cnrRdr.src = c.cfgObject.cnrSource
+		cnrRdr.get = c.cfgObject.cnrSource
 
 		cnrWrt.cacheEnabled = true
 		cnrWrt.eacls = cachedEACLStorage
@@ -640,7 +641,7 @@ func (c *usedSpaceService) processLoadValue(_ context.Context, a containerSDK.Si
 type morphContainerReader struct {
 	eacl containerCore.EACLSource
 
-	src containerCore.Source
+	get containerCore.Source
 
 	lister interface {
 		List(*user.ID) ([]cid.ID, error)
@@ -648,11 +649,7 @@ type morphContainerReader struct {
 }
 
 func (x *morphContainerReader) Get(id cid.ID) (*containerCore.Container, error) {
-	return x.src.Get(id)
+	return x.get.Get(id)
-}
-
-func (x *morphContainerReader) DeletionInfo(id cid.ID) (*containerCore.DelInfo, error) {
-	return x.src.DeletionInfo(id)
 }
 
 func (x *morphContainerReader) GetEACL(id cid.ID) (*containerCore.EACL, error) {

cmd/frostfs-node/tree.go

@@ -32,7 +32,7 @@ func (c cnrSource) Get(id cid.ID) (*container.Container, error) {
 }
 
 func (c cnrSource) DeletionInfo(cid cid.ID) (*container.DelInfo, error) {
-	return c.src.DeletionInfo(cid)
+	return c.cli.DeletionInfo(cid)
 }
 
 func (c cnrSource) List() ([]cid.ID, error) {

internal/logs/logs.go

@@ -42,7 +42,6 @@ const (
 	NotificatorNotificatorStartProcessingObjectNotifications                = "notificator: start processing object notifications"
 	NotificatorNotificatorProcessingObjectNotification                      = "notificator: processing object notification"
 	PolicerCouldNotGetContainer                                             = "could not get container"
-	PolicerCouldNotConfirmContainerRemoval                                  = "could not confirm container removal"
 	PolicerCouldNotInhumeObjectWithMissingContainer                         = "could not inhume object with missing container"
 	PolicerCouldNotBuildPlacementVectorForObject                            = "could not build placement vector for object"
 	PolicerRedundantLocalObjectCopyDetected                                 = "redundant local object copy detected"

pkg/core/container/storage.go

@@ -41,8 +41,6 @@ type Source interface {
 	// Implementations must not retain the container pointer and modify
 	// the container through it.
 	Get(cid.ID) (*Container, error)
-
-	DeletionInfo(cid.ID) (*DelInfo, error)
 }
 
 // EACL groups information about the FrostFS container's extended ACL stored in

pkg/core/container/util.go

@@ -1,22 +0,0 @@
-package container
-
-import (
-	"errors"
-
-	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
-	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
-)
-
-// WasRemoved checks whether the container ever existed or
-// it just has not been created yet at the current epoch.
-func WasRemoved(s Source, cid cid.ID) (bool, error) {
-	_, err := s.DeletionInfo(cid)
-	if err == nil {
-		return true, nil
-	}
-	var errContainerNotFound *apistatus.ContainerNotFound
-	if errors.As(err, &errContainerNotFound) {
-		return false, nil
-	}
-	return false, err
-}

pkg/local_object_storage/shard/get.go

@@ -2,7 +2,6 @@ package shard
 
 import (
 	"context"
-	"errors"
 	"fmt"
 
 	"git.frostfs.info/TrueCloudLab/frostfs-node/internal/logs"
@@ -139,10 +138,10 @@ func (s *Shard) fetchObjectData(ctx context.Context, addr oid.Address, skipMeta
 
 	if s.hasWriteCache() {
 		res, err := wc(s.writeCache)
-		if err == nil || IsErrOutOfRange(err) || client.IsErrObjectNotFound(err) {
+		if err == nil || IsErrOutOfRange(err) {
 			return res, false, err
 		}
-		if errors.Is(err, writecache.ErrMiss) {
+		if client.IsErrObjectNotFound(err) {
 			s.log.Debug(logs.ShardObjectIsMissingInWritecache,
 				zap.Stringer("addr", addr),
 				zap.Bool("skip_meta", skipMeta))

pkg/local_object_storage/writecache/writecache.go

@@ -63,11 +63,4 @@ var (
 	ErrBigObject = errors.New("too big object")
 	// ErrOutOfSpace is returned when there is no space left to put a new object.
 	ErrOutOfSpace = errors.New("no space left in the write cache")
-	// ErrMiss is returned when there is no information about the object in the cache.
-	// Note that the distinction between this error and ObjectNotFound is important. When
-	// the cache returns ObjectNotFound, it can be safely assumed that the object is not
-	// found in the cache or any underlying storage. When the cache returns ErrMiss, nothing
-	// is known about the object and thus the underlying storage must be consulted as well.
-	// This allows the cache to serve as a consistent view of the underlying storage.
-	ErrMiss = errors.New("write-cache miss")
 )

pkg/local_object_storage/writecache/writecachebadger/delete.go

@@ -6,8 +6,10 @@ import (
 
 	storagelog "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache"
 	"git.frostfs.info/TrueCloudLab/frostfs-observability/tracing"
+	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
 	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
 	"github.com/dgraph-io/badger/v4"
 	"go.opentelemetry.io/otel/attribute"
@@ -15,6 +17,8 @@ import (
 )
 
 // Delete removes object from write-cache.
+//
+// Returns an error of type apistatus.ObjectNotFound if object is missing in write-cache.
 func (c *cache) Delete(ctx context.Context, addr oid.Address) error {
 	_, span := tracing.StartSpanFromContext(ctx, "writecache.Delete",
 		trace.WithAttributes(
@@ -35,22 +39,22 @@ func (c *cache) Delete(ctx context.Context, addr oid.Address) error {
 		return writecache.ErrReadOnly
 	}
 
-	key := addr2key(addr)
+	saddr := addr.EncodeToString()
 
 	err := c.db.Update(func(tx *badger.Txn) error {
-		it, err := tx.Get(key[:])
+		it, err := tx.Get([]byte(saddr))
 		if err != nil {
 			if err == badger.ErrKeyNotFound {
-				return writecache.ErrMiss
+				return logicerr.Wrap(new(apistatus.ObjectNotFound))
 			}
 			return err
 		}
 		if it.ValueSize() > 0 {
 			storageType = writecache.StorageTypeDB
-			err := tx.Delete(key[:])
+			err := tx.Delete([]byte(saddr))
 			if err == nil {
 				storagelog.Write(c.log,
-					storagelog.AddressField(addr.EncodeToString()),
+					storagelog.AddressField(saddr),
 					storagelog.StorageTypeField(wcStorageType),
 					storagelog.OpField("db DELETE"),
 				)

pkg/local_object_storage/writecache/writecachebadger/flush_test.go

@@ -6,7 +6,6 @@ import (
 	"testing"
 	"time"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/storagetest"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil"
 	meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache"
@@ -17,7 +16,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestGeneric(t *testing.T) {
+func TestFlush(t *testing.T) {
 	createCacheFn := func(t *testing.T, smallSize uint64, mb *meta.DB, bs writecache.MainStorage, opts ...Option) writecache.Cache {
 		return New(
 			append([]Option{
@@ -60,22 +59,5 @@ func TestGeneric(t *testing.T) {
 		},
 	}
 
-	t.Run("api", func(t *testing.T) {
+	writecachetest.TestFlush(t, createCacheFn, errCountOpt, failures...)
-		writecachetest.TestAPI(t, createCacheFn)
-	})
-
-	t.Run("flush", func(t *testing.T) {
-		writecachetest.TestFlush(t, createCacheFn, errCountOpt, failures...)
-	})
-
-	t.Run("storage", func(t *testing.T) {
-		storagetest.TestAll(t, func(t *testing.T) storagetest.Component {
-			return New(
-				WithLogger(test.NewLogger(t, true)),
-				WithFlushWorkersCount(2),
-				WithPath(t.TempDir()),
-				WithGCInterval(1*time.Second))
-		})
-	})
-
 }

pkg/local_object_storage/writecache/writecachebadger/generic_test.go

@@ -0,0 +1,19 @@
+package writecachebadger
+
+import (
+	"testing"
+	"time"
+
+	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/storagetest"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger/test"
+)
+
+func TestGeneric(t *testing.T) {
+	storagetest.TestAll(t, func(t *testing.T) storagetest.Component {
+		return New(
+			WithLogger(test.NewLogger(t, true)),
+			WithFlushWorkersCount(2),
+			WithPath(t.TempDir()),
+			WithGCInterval(1*time.Second))
+	})
+}

pkg/local_object_storage/writecache/writecachebadger/get.go

@@ -5,8 +5,10 @@ import (
 	"time"
 
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache"
 	"git.frostfs.info/TrueCloudLab/frostfs-observability/tracing"
+	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
 	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
 	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
 	"github.com/dgraph-io/badger/v4"
@@ -14,6 +16,9 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
+// Get returns object from write-cache.
+//
+// Returns an error of type apistatus.ObjectNotFound if the requested object is missing in write-cache.
 func (c *cache) Get(ctx context.Context, addr oid.Address) (*objectSDK.Object, error) {
 	_, span := tracing.StartSpanFromContext(ctx, "writecache.Get",
 		trace.WithAttributes(
@@ -42,10 +47,12 @@ func (c *cache) getInternal(addr oid.Address) (*objectSDK.Object, error) {
 		return obj, obj.Unmarshal(value)
 	}
 
-	return nil, err
+	return nil, logicerr.Wrap(new(apistatus.ObjectNotFound))
 }
 
 // Head returns object header from write-cache.
+//
+// Returns an error of type apistatus.ObjectNotFound if the requested object is missing in write-cache.
 func (c *cache) Head(ctx context.Context, addr oid.Address) (*objectSDK.Object, error) {
 	_, span := tracing.StartSpanFromContext(ctx, "writecache.Head",
 		trace.WithAttributes(
@@ -63,6 +70,8 @@ func (c *cache) Head(ctx context.Context, addr oid.Address) (*objectSDK.Object,
 
 // Get fetches object from the underlying database.
 // Key should be a stringified address.
+//
+// Returns an error of type apistatus.ObjectNotFound if the requested object is missing in db.
 func Get(db *badger.DB, key []byte) ([]byte, error) {
 	var value []byte
 
@@ -70,7 +79,7 @@ func Get(db *badger.DB, key []byte) ([]byte, error) {
 		it, err := tx.Get(key)
 		if err != nil {
 			if err == badger.ErrKeyNotFound {
-				return writecache.ErrMiss
+				return logicerr.Wrap(new(apistatus.ObjectNotFound))
 			}
 			return err
 		}
@@ -82,5 +91,5 @@ func Get(db *badger.DB, key []byte) ([]byte, error) {
 		return nil
 	})
 
-	return value, err
+	return value, metaerr.Wrap(err)
 }

pkg/local_object_storage/writecache/writecachebbolt/delete.go

@@ -10,7 +10,6 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache"
 	"git.frostfs.info/TrueCloudLab/frostfs-observability/tracing"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client"
 	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
 	"go.etcd.io/bbolt"
 	"go.opentelemetry.io/otel/attribute"
@@ -18,6 +17,8 @@ import (
 )
 
 // Delete removes object from write-cache.
+//
+// Returns an error of type apistatus.ObjectNotFound if object is missing in write-cache.
 func (c *cache) Delete(ctx context.Context, addr oid.Address) error {
 	ctx, span := tracing.StartSpanFromContext(ctx, "writecache.Delete",
 		trace.WithAttributes(
@@ -60,7 +61,6 @@ func (c *cache) Delete(ctx context.Context, addr oid.Address) error {
 		if err != nil {
 			return err
 		}
-		deleted = true
 		storagelog.Write(c.log,
 			storagelog.AddressField(saddr),
 			storagelog.StorageTypeField(wcStorageType),
@@ -69,9 +69,9 @@ func (c *cache) Delete(ctx context.Context, addr oid.Address) error {
 		if recordDeleted {
 			c.objCounters.cDB.Add(math.MaxUint64)
 			c.estimateCacheSize()
-			return nil
 		}
-		return metaerr.Wrap(writecache.ErrMiss)
+		deleted = true
+		return nil
 	}
 
 	storageType = writecache.StorageTypeFSTree
@@ -85,8 +85,5 @@ func (c *cache) Delete(ctx context.Context, addr oid.Address) error {
 		deleted = true
 		c.estimateCacheSize()
 	}
-	if client.IsErrObjectNotFound(err) {
-		err = writecache.ErrMiss
-	}
 	return metaerr.Wrap(err)
 }

pkg/local_object_storage/writecache/writecachebbolt/flush_test.go

@@ -9,7 +9,6 @@ import (
 
 	objectCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common"
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/storagetest"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil"
 	meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache"
@@ -101,20 +100,5 @@ func TestFlush(t *testing.T) {
 		},
 	}
 
-	t.Run("api", func(t *testing.T) {
+	writecachetest.TestFlush(t, createCacheFn, errCountOpt, failures...)
-		writecachetest.TestAPI(t, createCacheFn)
-	})
-
-	t.Run("flush", func(t *testing.T) {
-		writecachetest.TestFlush(t, createCacheFn, errCountOpt, failures...)
-	})
-
-	t.Run("storage", func(t *testing.T) {
-		storagetest.TestAll(t, func(t *testing.T) storagetest.Component {
-			return New(
-				WithLogger(test.NewLogger(t, true)),
-				WithFlushWorkersCount(2),
-				WithPath(t.TempDir()))
-		})
-	})
 }

pkg/local_object_storage/writecache/writecachebbolt/generic_test.go

@@ -0,0 +1,17 @@
+package writecachebbolt
+
+import (
+	"testing"
+
+	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/storagetest"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger/test"
+)
+
+func TestGeneric(t *testing.T) {
+	storagetest.TestAll(t, func(t *testing.T) storagetest.Component {
+		return New(
+			WithLogger(test.NewLogger(t, true)),
+			WithFlushWorkersCount(2),
+			WithPath(t.TempDir()))
+	})
+}

pkg/local_object_storage/writecache/writecachebbolt/get.go

@@ -6,8 +6,10 @@ import (
 
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache"
 	"git.frostfs.info/TrueCloudLab/frostfs-observability/tracing"
+	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
 	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
 	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
 	"github.com/nspcc-dev/neo-go/pkg/util/slice"
@@ -50,7 +52,7 @@ func (c *cache) getInternal(ctx context.Context, saddr string, addr oid.Address)
 
 	res, err := c.fsTree.Get(ctx, common.GetPrm{Address: addr})
 	if err != nil {
-		return nil, metaerr.Wrap(writecache.ErrMiss)
+		return nil, logicerr.Wrap(new(apistatus.ObjectNotFound))
 	}
 
 	found = true
@@ -59,6 +61,8 @@ func (c *cache) getInternal(ctx context.Context, saddr string, addr oid.Address)
 }
 
 // Head returns object header from write-cache.
+//
+// Returns an error of type apistatus.ObjectNotFound if the requested object is missing in write-cache.
 func (c *cache) Head(ctx context.Context, addr oid.Address) (*objectSDK.Object, error) {
 	saddr := addr.EncodeToString()
 
@@ -78,6 +82,8 @@ func (c *cache) Head(ctx context.Context, addr oid.Address) (*objectSDK.Object,
 
 // Get fetches object from the underlying database.
 // Key should be a stringified address.
+//
+// Returns an error of type apistatus.ObjectNotFound if the requested object is missing in db.
 func Get(db *bbolt.DB, key []byte) ([]byte, error) {
 	var value []byte
 	err := db.View(func(tx *bbolt.Tx) error {
@@ -87,7 +93,7 @@ func Get(db *bbolt.DB, key []byte) ([]byte, error) {
 		}
 		value = b.Get(key)
 		if value == nil {
-			return metaerr.Wrap(writecache.ErrMiss)
+			return logicerr.Wrap(new(apistatus.ObjectNotFound))
 		}
 		value = slice.Copy(value)
 		return nil

pkg/local_object_storage/writecache/writecachetest/api.go

@@ -1,60 +0,0 @@
-package writecachetest
-
-import (
-	"context"
-	"testing"
-
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common"
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil"
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache"
-	oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test"
-	"github.com/stretchr/testify/require"
-)
-
-func TestAPI[Option any](t *testing.T, createCacheFn CreateCacheFunc[Option]) {
-	ctx := context.Background()
-	wc, _, _ := newCache(t, createCacheFn, smallSize)
-
-	obj := testutil.GenerateObject()
-	addr := testutil.AddressFromObject(t, obj)
-	data, err := obj.Marshal()
-	require.NoError(t, err)
-
-	// Get nonexistent object
-	{
-		_, gotErr := wc.Get(ctx, oidtest.Address())
-		require.ErrorIs(t, gotErr, writecache.ErrMiss)
-	}
-
-	// Put an object
-	{
-		_, err := wc.Put(ctx, common.PutPrm{
-			Address: addr,
-			Object:  obj,
-			RawData: data,
-		})
-
-		require.NoError(t, err)
-	}
-
-	// Get the object previously put
-	{
-		gotObj, err := wc.Get(ctx, addr)
-		require.NoError(t, err)
-		gotData, err := gotObj.Marshal()
-		require.NoError(t, err)
-		require.Equal(t, data, gotData)
-	}
-
-	// Delete the object previously put
-	{
-		require.NoError(t, wc.Delete(ctx, addr))
-		require.ErrorIs(t, wc.Delete(ctx, addr), writecache.ErrMiss)
-	}
-
-	// Get the object previously deleted
-	{
-		_, gotErr := wc.Get(ctx, addr)
-		require.Error(t, gotErr, writecache.ErrMiss)
-	}
-}

pkg/local_object_storage/writecache/writecachetest/flush.go

@@ -2,10 +2,20 @@ package writecachetest
 
 import (
 	"context"
+	"path/filepath"
 	"sync/atomic"
 	"testing"
 
+	objectCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil"
+	meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache"
+	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
+	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
 	"github.com/stretchr/testify/require"
 )
 
@@ -14,6 +24,24 @@ const (
 	smallSize = 256
 )
 
+type CreateCacheFunc[Option any] func(
+	t *testing.T,
+	smallSize uint64,
+	meta *meta.DB,
+	bs writecache.MainStorage,
+	opts ...Option,
+) writecache.Cache
+
+type TestFailureInjector[Option any] struct {
+	Desc     string
+	InjectFn func(*testing.T, writecache.Cache)
+}
+
+type objectPair struct {
+	addr oid.Address
+	obj  *objectSDK.Object
+}
+
 func TestFlush[Option any](
 	t *testing.T,
 	createCacheFn CreateCacheFunc[Option],
@@ -22,11 +50,6 @@ func TestFlush[Option any](
 ) {
 	t.Run("no errors", func(t *testing.T) {
 		wc, bs, mb := newCache(t, createCacheFn, smallSize)
-
-		// Set mode for metabase and blobstor to prevent background flushes.
-		require.NoError(t, mb.SetMode(mode.ReadOnly))
-		require.NoError(t, bs.SetMode(mode.ReadOnly))
-
 		objects := putObjects(t, wc)
 
 		require.NoError(t, bs.SetMode(mode.ReadWrite))
@@ -39,11 +62,6 @@ func TestFlush[Option any](
 
 	t.Run("flush on moving to degraded mode", func(t *testing.T) {
 		wc, bs, mb := newCache(t, createCacheFn, smallSize)
-
-		// Set mode for metabase and blobstor to prevent background flushes.
-		require.NoError(t, mb.SetMode(mode.ReadOnly))
-		require.NoError(t, bs.SetMode(mode.ReadOnly))
-
 		objects := putObjects(t, wc)
 
 		// Blobstor is read-only, so we expect en error from `flush` here.
@@ -64,11 +82,6 @@ func TestFlush[Option any](
 			t.Run(f.Desc, func(t *testing.T) {
 				errCountOpt, errCount := errCountOption()
 				wc, bs, mb := newCache(t, createCacheFn, smallSize, errCountOpt)
-
-				// Set mode for metabase and blobstor to prevent background flushes.
-				require.NoError(t, mb.SetMode(mode.ReadOnly))
-				require.NoError(t, bs.SetMode(mode.ReadOnly))
-
 				objects := putObjects(t, wc)
 				f.InjectFn(t, wc)
 
@@ -86,3 +99,87 @@ func TestFlush[Option any](
 		}
 	})
 }
+
+func newCache[Option any](
+	t *testing.T,
+	createCacheFn CreateCacheFunc[Option],
+	smallSize uint64,
+	opts ...Option,
+) (writecache.Cache, *blobstor.BlobStor, *meta.DB) {
+	dir := t.TempDir()
+	mb := meta.New(
+		meta.WithPath(filepath.Join(dir, "meta")),
+		meta.WithEpochState(dummyEpoch{}))
+	require.NoError(t, mb.Open(false))
+	require.NoError(t, mb.Init())
+
+	bs := blobstor.New(blobstor.WithStorages([]blobstor.SubStorage{
+		{
+			Storage: fstree.New(
+				fstree.WithPath(filepath.Join(dir, "blob")),
+				fstree.WithDepth(0),
+				fstree.WithDirNameLen(1)),
+		},
+	}))
+	require.NoError(t, bs.Open(false))
+	require.NoError(t, bs.Init())
+
+	wc := createCacheFn(t, smallSize, mb, bs, opts...)
+	t.Cleanup(func() { require.NoError(t, wc.Close()) })
+	require.NoError(t, wc.Open(false))
+	require.NoError(t, wc.Init())
+
+	// First set mode for metabase and blobstor to prevent background flushes.
+	require.NoError(t, mb.SetMode(mode.ReadOnly))
+	require.NoError(t, bs.SetMode(mode.ReadOnly))
+
+	return wc, bs, mb
+}
+
+func putObject(t *testing.T, c writecache.Cache, size int) objectPair {
+	obj := testutil.GenerateObjectWithSize(size)
+	data, err := obj.Marshal()
+	require.NoError(t, err)
+
+	var prm common.PutPrm
+	prm.Address = objectCore.AddressOf(obj)
+	prm.Object = obj
+	prm.RawData = data
+
+	_, err = c.Put(context.Background(), prm)
+	require.NoError(t, err)
+
+	return objectPair{prm.Address, prm.Object}
+}
+
+func putObjects(t *testing.T, c writecache.Cache) []objectPair {
+	objects := make([]objectPair, objCount)
+	for i := range objects {
+		objects[i] = putObject(t, c, 1+(i%2)*smallSize)
+	}
+	return objects
+}
+
+func check(t *testing.T, mb *meta.DB, bs *blobstor.BlobStor, objects []objectPair) {
+	for i := range objects {
+		var mPrm meta.StorageIDPrm
+		mPrm.SetAddress(objects[i].addr)
+
+		mRes, err := mb.StorageID(context.Background(), mPrm)
+		require.NoError(t, err)
+
+		var prm common.GetPrm
+		prm.Address = objects[i].addr
+		prm.StorageID = mRes.StorageID()
+
+		res, err := bs.Get(context.Background(), prm)
+		require.NoError(t, err)
+		require.Equal(t, objects[i].obj, res.Object)
+	}
+}
+
+type dummyEpoch struct{}
+
+func (dummyEpoch) CurrentEpoch() uint64 {
+	return 0
+}

pkg/local_object_storage/writecache/writecachetest/writecachetest.go

@@ -1,116 +0,0 @@
-package writecachetest
-
-import (
-	"context"
-	"path/filepath"
-	"testing"
-
-	objectCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object"
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor"
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common"
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree"
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil"
-	meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase"
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache"
-	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
-	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
-	"github.com/stretchr/testify/require"
-)
-
-type CreateCacheFunc[Option any] func(
-	t *testing.T,
-	smallSize uint64,
-	meta *meta.DB,
-	bs writecache.MainStorage,
-	opts ...Option,
-) writecache.Cache
-
-type TestFailureInjector[Option any] struct {
-	Desc     string
-	InjectFn func(*testing.T, writecache.Cache)
-}
-
-type objectPair struct {
-	addr oid.Address
-	obj  *objectSDK.Object
-}
-
-func newCache[Option any](
-	t *testing.T,
-	createCacheFn CreateCacheFunc[Option],
-	smallSize uint64,
-	opts ...Option,
-) (writecache.Cache, *blobstor.BlobStor, *meta.DB) {
-	dir := t.TempDir()
-	mb := meta.New(
-		meta.WithPath(filepath.Join(dir, "meta")),
-		meta.WithEpochState(dummyEpoch{}))
-	require.NoError(t, mb.Open(false))
-	require.NoError(t, mb.Init())
-
-	bs := blobstor.New(blobstor.WithStorages([]blobstor.SubStorage{
-		{
-			Storage: fstree.New(
-				fstree.WithPath(filepath.Join(dir, "blob")),
-				fstree.WithDepth(0),
-				fstree.WithDirNameLen(1)),
-		},
-	}))
-	require.NoError(t, bs.Open(false))
-	require.NoError(t, bs.Init())
-
-	wc := createCacheFn(t, smallSize, mb, bs, opts...)
-	t.Cleanup(func() { require.NoError(t, wc.Close()) })
-	require.NoError(t, wc.Open(false))
-	require.NoError(t, wc.Init())
-
-	return wc, bs, mb
-}
-
-func putObject(t *testing.T, c writecache.Cache, size int) objectPair {
-	obj := testutil.GenerateObjectWithSize(size)
-	data, err := obj.Marshal()
-	require.NoError(t, err)
-
-	var prm common.PutPrm
-	prm.Address = objectCore.AddressOf(obj)
-	prm.Object = obj
-	prm.RawData = data
-
-	_, err = c.Put(context.Background(), prm)
-	require.NoError(t, err)
-
-	return objectPair{prm.Address, prm.Object}
-}
-
-func putObjects(t *testing.T, c writecache.Cache) []objectPair {
-	objects := make([]objectPair, objCount)
-	for i := range objects {
-		objects[i] = putObject(t, c, 1+(i%2)*smallSize)
-	}
-	return objects
-}
-
-func check(t *testing.T, mb *meta.DB, bs *blobstor.BlobStor, objects []objectPair) {
-	for i := range objects {
-		var mPrm meta.StorageIDPrm
-		mPrm.SetAddress(objects[i].addr)
-
-		mRes, err := mb.StorageID(context.Background(), mPrm)
-		require.NoError(t, err)
-
-		var prm common.GetPrm
-		prm.Address = objects[i].addr
-		prm.StorageID = mRes.StorageID()
-
-		res, err := bs.Get(context.Background(), prm)
-		require.NoError(t, err)
-		require.Equal(t, objects[i].obj, res.Object)
-	}
-}
-
-type dummyEpoch struct{}
-
-func (dummyEpoch) CurrentEpoch() uint64 {
-	return 0
-}

pkg/morph/client/container/deletion_info.go

@@ -1,7 +1,6 @@
 package container
 
 import (
-	"crypto/sha256"
 	"fmt"
 	"strings"
 
@@ -12,22 +11,7 @@ import (
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
 )
 
-func (x *containerSource) DeletionInfo(cnr cid.ID) (*containercore.DelInfo, error) {
+func (c *Client) DeletionInfo(cid cid.ID) (*containercore.DelInfo, error) {
-	return DeletionInfo((*Client)(x), cnr)
-}
-
-type deletionInfo interface {
-	DeletionInfo(cid []byte) (*containercore.DelInfo, error)
-}
-
-func DeletionInfo(c deletionInfo, cnr cid.ID) (*containercore.DelInfo, error) {
-	binCnr := make([]byte, sha256.Size)
-	cnr.Encode(binCnr)
-
-	return c.DeletionInfo(binCnr)
-}
-
-func (c *Client) DeletionInfo(cid []byte) (*containercore.DelInfo, error) {
 	prm := client.TestInvokePrm{}
 	prm.SetMethod(deletionInfoMethod)
 	prm.SetArgs(cid)

pkg/services/policer/check.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 
 	"git.frostfs.info/TrueCloudLab/frostfs-node/internal/logs"
-	containercore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container"
 	objectcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/replicator"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client"
@@ -28,20 +27,12 @@ func (p *Policer) processObject(ctx context.Context, addrWithType objectcore.Add
 			zap.String("error", err.Error()),
 		)
 		if client.IsErrContainerNotFound(err) {
-			existed, err := containercore.WasRemoved(p.cnrSrc, idCnr)
+			err := p.buryFn(ctx, addrWithType.Address)
 			if err != nil {
-				p.log.Error(logs.PolicerCouldNotConfirmContainerRemoval,
+				p.log.Error(logs.PolicerCouldNotInhumeObjectWithMissingContainer,
 					zap.Stringer("cid", idCnr),
 					zap.Stringer("oid", idObj),
 					zap.String("error", err.Error()))
-			} else if existed {
-				err := p.buryFn(ctx, addrWithType.Address)
-				if err != nil {
-					p.log.Error(logs.PolicerCouldNotInhumeObjectWithMissingContainer,
-						zap.Stringer("cid", idCnr),
-						zap.Stringer("oid", idObj),
-						zap.String("error", err.Error()))
-				}
 			}
 		}
 

pkg/services/policer/policer_test.go

@@ -34,13 +34,8 @@ func TestBuryObjectWithoutContainer(t *testing.T) {
 
 	// Container source and bury function
 	buryCh := make(chan oid.Address)
-	containerSrc := containerSrc{
+	containerSrc := func(id cid.ID) (*container.Container, error) {
-		get: func(id cid.ID) (*container.Container, error) {
+		return nil, new(apistatus.ContainerNotFound)
-			return nil, new(apistatus.ContainerNotFound)
-		},
-		deletionInfo: func(id cid.ID) (*container.DelInfo, error) {
-			return &container.DelInfo{}, nil
-		},
 	}
 	buryFn := func(ctx context.Context, a oid.Address) error {
 		buryCh <- a
@@ -54,7 +49,7 @@ func TestBuryObjectWithoutContainer(t *testing.T) {
 	// Policer instance
 	p := New(
 		WithKeySpaceIterator(&sliceKeySpaceIterator{objs: objs}),
-		WithContainerSource(containerSrc),
+		WithContainerSource(containerSrcFunc(containerSrc)),
 		WithBuryFunc(buryFn),
 		WithPool(pool),
 	)
@@ -199,17 +194,12 @@ func TestProcessObject(t *testing.T) {
 			cnr := &container.Container{}
 			cnr.Value.Init()
 			cnr.Value.SetPlacementPolicy(policy)
-			containerSrc := containerSrc{
+			containerSrc := func(id cid.ID) (*container.Container, error) {
-				get: func(id cid.ID) (*container.Container, error) {
+				if id.Equals(addr.Container()) {
-					if id.Equals(addr.Container()) {
+					return cnr, nil
-						return cnr, nil
+				}
-					}
+				t.Errorf("unexpected container requested: got=%v, want=%v", id, addr.Container())
-					t.Errorf("unexpected container requested: got=%v, want=%v", id, addr.Container())
+				return nil, new(apistatus.ContainerNotFound)
-					return nil, new(apistatus.ContainerNotFound)
-				},
-				deletionInfo: func(id cid.ID) (*container.DelInfo, error) {
-					return &container.DelInfo{}, nil
-				},
 			}
 			buryFn := func(ctx context.Context, a oid.Address) error {
 				t.Errorf("unexpected object buried: %v", a)
@@ -221,7 +211,7 @@ func TestProcessObject(t *testing.T) {
 			var gotReplicateTo []int
 
 			p := New(
-				WithContainerSource(containerSrc),
+				WithContainerSource(containerSrcFunc(containerSrc)),
 				WithPlacementBuilder(placementBuilderFunc(placementBuilder)),
 				WithNetmapKeys(announcedKeysFunc(func(k []byte) bool {
 					return bytes.Equal(k, nodes[0].PublicKey())
@@ -261,6 +251,9 @@ func TestIteratorContract(t *testing.T) {
 		Type:    objectSDK.TypeRegular,
 	}}
 
+	containerSrc := func(id cid.ID) (*container.Container, error) {
+		return nil, new(apistatus.ContainerNotFound)
+	}
 	buryFn := func(ctx context.Context, a oid.Address) error {
 		return nil
 	}
@@ -280,18 +273,9 @@ func TestIteratorContract(t *testing.T) {
 		finishCh: make(chan struct{}),
 	}
 
-	containerSrc := containerSrc{
-		get: func(id cid.ID) (*container.Container, error) {
-			return nil, new(apistatus.ContainerNotFound)
-		},
-		deletionInfo: func(id cid.ID) (*container.DelInfo, error) {
-			return &container.DelInfo{}, nil
-		},
-	}
-
 	p := New(
 		WithKeySpaceIterator(it),
-		WithContainerSource(containerSrc),
+		WithContainerSource(containerSrcFunc(containerSrc)),
 		WithBuryFunc(buryFn),
 		WithPool(pool),
 		func(c *cfg) {
@@ -369,14 +353,10 @@ func (it *sliceKeySpaceIterator) Rewind() {
 	it.cur = 0
 }
 
-type containerSrc struct {
+// containerSrcFunc is a container.Source backed by a function.
-	get          func(id cid.ID) (*container.Container, error)
+type containerSrcFunc func(cid.ID) (*container.Container, error)
-	deletionInfo func(id cid.ID) (*container.DelInfo, error)
-}
 
-func (f containerSrc) Get(id cid.ID) (*container.Container, error) { return f.get(id) }
+func (f containerSrcFunc) Get(id cid.ID) (*container.Container, error) { return f(id) }
-
-func (f containerSrc) DeletionInfo(id cid.ID) (*container.DelInfo, error) { return f.deletionInfo(id) }
 
 // placementBuilderFunc is a placement.Builder backed by a function
 type placementBuilderFunc func(cid.ID, *oid.ID, netmap.PlacementPolicy) ([][]netmap.NodeInfo, error)

pkg/services/tree/sync.go

@@ -12,13 +12,13 @@ import (
 	"time"
 
 	"git.frostfs.info/TrueCloudLab/frostfs-node/internal/logs"
-	containerCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/netmap"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network"
 	metrics "git.frostfs.info/TrueCloudLab/frostfs-observability/metrics/grpc"
 	tracing "git.frostfs.info/TrueCloudLab/frostfs-observability/tracing"
 	tracing_grpc "git.frostfs.info/TrueCloudLab/frostfs-observability/tracing/grpc"
+	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
 	netmapSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap"
 	"github.com/panjf2000/ants/v2"
@@ -441,6 +441,18 @@ func (s *Service) syncContainers(ctx context.Context, cnrs []cid.ID) {
 	wg.Wait()
 }
 
+func (s *Service) containerEverExisted(cid cid.ID) (bool, error) {
+	_, err := s.cnrSource.DeletionInfo(cid)
+	if err == nil {
+		return true, nil
+	}
+	var errContainerNotFound *apistatus.ContainerNotFound
+	if errors.As(err, &errContainerNotFound) {
+		return false, nil
+	}
+	return false, err
+}
+
 func (s *Service) removeContainers(ctx context.Context, newContainers map[cid.ID]struct{}) {
 	ctx, span := tracing.StartSpanFromContext(ctx, "TreeService.removeContainers")
 	defer span.End()
@@ -454,7 +466,7 @@ func (s *Service) removeContainers(ctx context.Context, newContainers map[cid.ID
 			continue
 		}
 
-		existed, err := containerCore.WasRemoved(s.cnrSource, cnr)
+		existed, err := s.containerEverExisted(cnr)
 		if err != nil {
 			s.log.Error(logs.TreeCouldNotCheckIfContainerExisted,
 				zap.Stringer("cid", cnr),