[#667] writecache: Add logs for report error func in tests

Signed-off-by: Airat Arifullin a.arifullin@yadro.com

.pre-commit-config.yaml

@@ -26,7 +26,7 @@ repos:
       exclude: ".key$"
 
   - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.9.0.2
+    rev: v0.9.0.5
     hooks:
       - id: shellcheck
 

cmd/frostfs-cli/internal/client/client.go

@@ -8,6 +8,7 @@ import (
 	"io"
 
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/accounting"
+	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/checksum"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client"
 	containerSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container"
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
@@ -224,8 +225,8 @@ func SetEACL(ctx context.Context, prm SetEACLPrm) (res SetEACLRes, err error) {
 
 // NetworkInfoPrm groups parameters of NetworkInfo operation.
 type NetworkInfoPrm struct {
-	commonPrm
+	Client       *client.Client
-	client.PrmNetworkInfo
+	ClientParams client.PrmNetworkInfo
 }
 
 // NetworkInfoRes groups the resulting values of NetworkInfo operation.
@@ -242,15 +243,15 @@ func (x NetworkInfoRes) NetworkInfo() netmap.NetworkInfo {
 //
 // Returns any error which prevented the operation from completing correctly in error return.
 func NetworkInfo(ctx context.Context, prm NetworkInfoPrm) (res NetworkInfoRes, err error) {
-	res.cliRes, err = prm.cli.NetworkInfo(ctx, prm.PrmNetworkInfo)
+	res.cliRes, err = prm.Client.NetworkInfo(ctx, prm.ClientParams)
 
 	return
 }
 
 // NodeInfoPrm groups parameters of NodeInfo operation.
 type NodeInfoPrm struct {
-	commonPrm
+	Client       *client.Client
-	client.PrmEndpointInfo
+	ClientParams client.PrmEndpointInfo
 }
 
 // NodeInfoRes groups the resulting values of NodeInfo operation.
@@ -272,7 +273,7 @@ func (x NodeInfoRes) LatestVersion() version.Version {
 //
 // Returns any error which prevented the operation from completing correctly in error return.
 func NodeInfo(ctx context.Context, prm NodeInfoPrm) (res NodeInfoRes, err error) {
-	res.cliRes, err = prm.cli.EndpointInfo(ctx, prm.PrmEndpointInfo)
+	res.cliRes, err = prm.Client.EndpointInfo(ctx, prm.ClientParams)
 
 	return
 }
@@ -507,20 +508,17 @@ func (x DeleteObjectRes) Tombstone() oid.ID {
 //
 // Returns any error which prevented the operation from completing correctly in error return.
 func DeleteObject(ctx context.Context, prm DeleteObjectPrm) (*DeleteObjectRes, error) {
-	var delPrm client.PrmObjectDelete
+	cnr := prm.objAddr.Container()
-	delPrm.FromContainer(prm.objAddr.Container())
+	obj := prm.objAddr.Object()
-	delPrm.ByID(prm.objAddr.Object())
 
-	if prm.sessionToken != nil {
+	delPrm := client.PrmObjectDelete{
-		delPrm.WithinSession(*prm.sessionToken)
+		XHeaders:    prm.xHeaders,
+		ContainerID: &cnr,
+		ObjectID:    &obj,
+		Session:     prm.sessionToken,
+		BearerToken: prm.bearerToken,
 	}
 
-	if prm.bearerToken != nil {
-		delPrm.WithBearerToken(*prm.bearerToken)
-	}
-
-	delPrm.WithXHeaders(prm.xHeaders...)
-
 	cliRes, err := prm.cli.ObjectDelete(ctx, delPrm)
 	if err != nil {
 		return nil, fmt.Errorf("remove object via client: %w", err)
@@ -741,7 +739,7 @@ type HashPayloadRangesPrm struct {
 
 	tz bool
 
-	rngs []*objectSDK.Range
+	rngs []objectSDK.Range
 
 	salt []byte
 }
@@ -752,7 +750,7 @@ func (x *HashPayloadRangesPrm) TZ() {
 }
 
 // SetRanges sets a list of payload ranges to hash.
-func (x *HashPayloadRangesPrm) SetRanges(rngs []*objectSDK.Range) {
+func (x *HashPayloadRangesPrm) SetRanges(rngs []objectSDK.Range) {
 	x.rngs = rngs
 }
 
@@ -776,39 +774,25 @@ func (x HashPayloadRangesRes) HashList() [][]byte {
 // Returns any error which prevented the operation from completing correctly in error return.
 // Returns an error if number of received hashes differs with the number of requested ranges.
 func HashPayloadRanges(ctx context.Context, prm HashPayloadRangesPrm) (*HashPayloadRangesRes, error) {
-	var cliPrm client.PrmObjectHash
+	cs := checksum.SHA256
-	cliPrm.FromContainer(prm.objAddr.Container())
-	cliPrm.ByID(prm.objAddr.Object())
-
-	if prm.local {
-		cliPrm.MarkLocal()
-	}
-
-	cliPrm.UseSalt(prm.salt)
-
-	rngs := make([]uint64, 2*len(prm.rngs))
-
-	for i := range prm.rngs {
-		rngs[2*i] = prm.rngs[i].GetOffset()
-		rngs[2*i+1] = prm.rngs[i].GetLength()
-	}
-
-	cliPrm.SetRangeList(rngs...)
-
 	if prm.tz {
-		cliPrm.TillichZemorAlgo()
+		cs = checksum.TZ
 	}
 
-	if prm.sessionToken != nil {
+	cnr := prm.objAddr.Container()
-		cliPrm.WithinSession(*prm.sessionToken)
+	obj := prm.objAddr.Object()
+	cliPrm := client.PrmObjectHash{
+		ContainerID:  &cnr,
+		ObjectID:     &obj,
+		Local:        prm.local,
+		Salt:         prm.salt,
+		Ranges:       prm.rngs,
+		ChecksumType: cs,
+		Session:      prm.sessionToken,
+		BearerToken:  prm.bearerToken,
+		XHeaders:     prm.xHeaders,
 	}
 
-	if prm.bearerToken != nil {
-		cliPrm.WithBearerToken(*prm.bearerToken)
-	}
-
-	cliPrm.WithXHeaders(prm.xHeaders...)
-
 	res, err := prm.cli.ObjectHash(ctx, cliPrm)
 	if err != nil {
 		return nil, fmt.Errorf("read payload hashes via client: %w", err)

cmd/frostfs-cli/modules/container/create.go

@@ -185,12 +185,12 @@ func parseContainerPolicy(cmd *cobra.Command, policyString string) (*netmap.Plac
 		return &result, nil
 	}
 
-	if err = result.UnmarshalJSON([]byte(policyString)); err == nil {
+	if err := result.UnmarshalJSON([]byte(policyString)); err == nil {
 		common.PrintVerbose(cmd, "Parsed JSON encoded policy")
 		return &result, nil
 	}
 
-	return nil, errors.New("can't parse placement policy")
+	return nil, fmt.Errorf("can't parse placement policy: %w", err)
 }
 
 func parseAttributes(dst *container.Container, attributes []string) error {

cmd/frostfs-cli/modules/netmap/get_epoch.go

@@ -16,8 +16,9 @@ var getEpochCmd = &cobra.Command{
 		p := key.GetOrGenerate(cmd)
 		cli := internalclient.GetSDKClientByFlag(cmd, p, commonflags.RPC)
 
-		var prm internalclient.NetworkInfoPrm
+		prm := internalclient.NetworkInfoPrm{
-		prm.SetClient(cli)
+			Client: cli,
+		}
 
 		res, err := internalclient.NetworkInfo(cmd.Context(), prm)
 		commonCmd.ExitOnErr(cmd, "rpc error: %w", err)

cmd/frostfs-cli/modules/netmap/netinfo.go

@@ -20,8 +20,9 @@ var netInfoCmd = &cobra.Command{
 		p := key.GetOrGenerate(cmd)
 		cli := internalclient.GetSDKClientByFlag(cmd, p, commonflags.RPC)
 
-		var prm internalclient.NetworkInfoPrm
+		prm := internalclient.NetworkInfoPrm{
-		prm.SetClient(cli)
+			Client: cli,
+		}
 
 		res, err := internalclient.NetworkInfo(cmd.Context(), prm)
 		commonCmd.ExitOnErr(cmd, "rpc error: %w", err)

cmd/frostfs-cli/modules/netmap/nodeinfo.go

@@ -22,8 +22,9 @@ var nodeInfoCmd = &cobra.Command{
 		p := key.GetOrGenerate(cmd)
 		cli := internalclient.GetSDKClientByFlag(cmd, p, commonflags.RPC)
 
-		var prm internalclient.NodeInfoPrm
+		prm := internalclient.NodeInfoPrm{
-		prm.SetClient(cli)
+			Client: cli,
+		}
 
 		res, err := internalclient.NodeInfo(cmd.Context(), prm)
 		commonCmd.ExitOnErr(cmd, "rpc error: %w", err)

cmd/frostfs-cli/modules/object/range.go

@@ -84,7 +84,7 @@ func getObjectRange(cmd *cobra.Command, _ []string) {
 	raw, _ := cmd.Flags().GetBool(rawFlag)
 	prm.SetRawFlag(raw)
 	prm.SetAddress(objAddr)
-	prm.SetRange(ranges[0])
+	prm.SetRange(&ranges[0])
 	prm.SetPayloadWriter(out)
 
 	_, err = internalclient.PayloadRange(cmd.Context(), prm)
@@ -146,13 +146,13 @@ func marshalSplitInfo(cmd *cobra.Command, info *objectSDK.SplitInfo) ([]byte, er
 	}
 }
 
-func getRangeList(cmd *cobra.Command) ([]*objectSDK.Range, error) {
+func getRangeList(cmd *cobra.Command) ([]objectSDK.Range, error) {
 	v := cmd.Flag("range").Value.String()
 	if len(v) == 0 {
 		return nil, nil
 	}
 	vs := strings.Split(v, ",")
-	rs := make([]*objectSDK.Range, len(vs))
+	rs := make([]objectSDK.Range, len(vs))
 	for i := range vs {
 		before, after, found := strings.Cut(vs[i], rangeSep)
 		if !found {
@@ -176,7 +176,6 @@ func getRangeList(cmd *cobra.Command) ([]*objectSDK.Range, error) {
 			return nil, fmt.Errorf("invalid '%s' range: uint64 overflow", vs[i])
 		}
 
-		rs[i] = objectSDK.NewRange()
 		rs[i].SetOffset(offset)
 		rs[i].SetLength(length)
 	}

cmd/frostfs-cli/modules/session/create.go

@@ -91,8 +91,9 @@ func createSession(cmd *cobra.Command, _ []string) {
 //
 // Fills ID, lifetime and session key.
 func CreateSession(ctx context.Context, dst *session.Object, c *client.Client, lifetime uint64) error {
-	var netInfoPrm internalclient.NetworkInfoPrm
+	netInfoPrm := internalclient.NetworkInfoPrm{
-	netInfoPrm.SetClient(c)
+		Client: c,
+	}
 
 	ni, err := internalclient.NetworkInfo(ctx, netInfoPrm)
 	if err != nil {
@@ -104,7 +105,7 @@ func CreateSession(ctx context.Context, dst *session.Object, c *client.Client, l
 
 	var sessionPrm internalclient.CreateSessionPrm
 	sessionPrm.SetClient(c)
-	sessionPrm.SetExp(exp)
+	sessionPrm.Expiration = exp
 
 	sessionRes, err := internalclient.CreateSession(ctx, sessionPrm)
 	if err != nil {

cmd/frostfs-lens/internal/meta/root.go

@@ -43,7 +43,7 @@ func openMeta(cmd *cobra.Command) *meta.DB {
 		}),
 		meta.WithEpochState(epochState{}),
 	)
-	common.ExitOnErr(cmd, common.Errf("could not open metabase: %w", db.Open(true)))
+	common.ExitOnErr(cmd, common.Errf("could not open metabase: %w", db.Open(cmd.Context(), true)))
 
 	return db
 }

cmd/frostfs-node/config.go

@@ -901,7 +901,7 @@ func (c *cfg) LocalAddress() network.AddressGroup {
 	return c.localAddr
 }
 
-func initLocalStorage(c *cfg) {
+func initLocalStorage(ctx context.Context, c *cfg) {
 	ls := engine.New(c.engineOpts()...)
 
 	addNewEpochAsyncNotificationHandler(c, func(ev event.Event) {
@@ -914,7 +914,7 @@ func initLocalStorage(c *cfg) {
 
 	var shardsAttached int
 	for _, optsWithMeta := range c.shardOpts() {
-		id, err := ls.AddShard(append(optsWithMeta.shOpts, shard.WithTombstoneSource(c.createTombstoneSource()))...)
+		id, err := ls.AddShard(ctx, append(optsWithMeta.shOpts, shard.WithTombstoneSource(c.createTombstoneSource()))...)
 		if err != nil {
 			c.log.Error(logs.FrostFSNodeFailedToAttachShardToEngine, zap.Error(err))
 		} else {
@@ -931,7 +931,7 @@ func initLocalStorage(c *cfg) {
 	c.onShutdown(func() {
 		c.log.Info(logs.FrostFSNodeClosingComponentsOfTheStorageEngine)
 
-		err := ls.Close()
+		err := ls.Close(context.Background())
 		if err != nil {
 			c.log.Info(logs.FrostFSNodeStorageEngineClosingFailure,
 				zap.String("error", err.Error()),

cmd/frostfs-node/container.go

@@ -383,9 +383,9 @@ func (r *remoteLoadAnnounceWriter) Put(a containerSDK.SizeEstimation) error {
 }
 
 func (r *remoteLoadAnnounceWriter) Close(ctx context.Context) error {
-	var cliPrm apiClient.PrmAnnounceSpace
+	cliPrm := apiClient.PrmAnnounceSpace{
-
+		Announcements: r.buf,
-	cliPrm.SetValues(r.buf)
+	}
 
 	_, err := r.client.ContainerAnnounceUsedSpace(ctx, cliPrm)
 	return err

cmd/frostfs-node/main.go

@@ -91,10 +91,10 @@ func initApp(ctx context.Context, c *cfg) {
 
 	initAndLog(c, "tracing", func(c *cfg) { initTracing(ctx, c) })
 
-	initLocalStorage(c)
+	initLocalStorage(ctx, c)
 
 	initAndLog(c, "storage engine", func(c *cfg) {
-		fatalOnErr(c.cfgObject.cfgLocalStorage.localStorage.Open())
+		fatalOnErr(c.cfgObject.cfgLocalStorage.localStorage.Open(ctx))
 		fatalOnErr(c.cfgObject.cfgLocalStorage.localStorage.Init(ctx))
 	})
 

go.mod

@@ -3,10 +3,10 @@ module git.frostfs.info/TrueCloudLab/frostfs-node
 go 1.20
 
 require (
-	git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.15.1-0.20230802075510-964c3edb3f44
+	git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.16.0
-	git.frostfs.info/TrueCloudLab/frostfs-contract v0.0.0-20230627134746-36f3d39c406a
+	git.frostfs.info/TrueCloudLab/frostfs-contract v0.18.0
 	git.frostfs.info/TrueCloudLab/frostfs-observability v0.0.0-20230531082742-c97d21411eb6
-	git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20230828082657-84e7e69f98ac
+	git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20230911122224-ac8fc6d4400c
 	git.frostfs.info/TrueCloudLab/hrw v1.2.1
 	git.frostfs.info/TrueCloudLab/tzhash v1.8.0
 	github.com/cheggaaa/pb v1.0.29
@@ -20,7 +20,7 @@ require (
 	github.com/mr-tron/base58 v1.2.0
 	github.com/multiformats/go-multiaddr v0.9.0
 	github.com/nats-io/nats.go v1.27.1
-	github.com/nspcc-dev/neo-go v0.101.2-0.20230601131642-a0117042e8fc
+	github.com/nspcc-dev/neo-go v0.101.5-0.20230808195420-5fc61be5f6c5
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/panjf2000/ants/v2 v2.7.5
 	github.com/paulmach/orb v0.9.2
@@ -97,7 +97,7 @@ require (
 	github.com/nats-io/nkeys v0.4.4 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
 	github.com/nspcc-dev/go-ordered-json v0.0.0-20220111165707-25110be27d22 // indirect
-	github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20230615193820-9185820289ce // indirect
+	github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20230808195420-5fc61be5f6c5 // indirect
 	github.com/nspcc-dev/rfc6979 v0.2.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect

internal/logs/logs.go

@@ -53,6 +53,7 @@ const (
 	PolicerRoutineStopped                                                   = "routine stopped"
 	PolicerFailureAtObjectSelectForReplication                              = "failure at object select for replication"
 	PolicerPoolSubmission                                                   = "pool submission"
+	PolicerUnableToProcessObj                                               = "unable to process object"
 	ReplicatorFinishWork                                                    = "finish work"
 	ReplicatorCouldNotGetObjectFromLocalStorage                             = "could not get object from local storage"
 	ReplicatorCouldNotReplicateObject                                       = "could not replicate object"
@@ -257,6 +258,7 @@ const (
 	ShardMetaObjectCounterRead                                              = "meta: object counter read"
 	ShardMetaCantReadContainerList                                          = "meta: can't read container list"
 	ShardMetaCantReadContainerSize                                          = "meta: can't read container size"
+	ShardMetaInfoPresentButObjectNotFound                                   = "meta info was present, but the object is missing"
 	ShardMetabaseFailureSwitchingMode                                       = "metabase failure, switching mode"
 	ShardCantMoveShardToReadonlySwitchMode                                  = "can't move shard to readonly, switch mode"
 	ShardCouldNotUnmarshalObject                                            = "could not unmarshal object"

pkg/local_object_storage/blobstor/blobstor_test.go

@@ -51,7 +51,7 @@ func TestCompression(t *testing.T) {
 		bs := New(
 			WithCompressObjects(compress),
 			WithStorages(defaultStorages(dir, smallSizeLimit)))
-		require.NoError(t, bs.Open(false))
+		require.NoError(t, bs.Open(context.Background(), false))
 		require.NoError(t, bs.Init())
 		return bs
 	}
@@ -126,7 +126,7 @@ func TestBlobstor_needsCompression(t *testing.T) {
 					Storage: fstree.New(fstree.WithPath(dir)),
 				},
 			}))
-		require.NoError(t, bs.Open(false))
+		require.NoError(t, bs.Open(context.Background(), false))
 		require.NoError(t, bs.Init())
 		return bs
 	}
@@ -188,7 +188,7 @@ func TestConcurrentPut(t *testing.T) {
 
 	blobStor := New(
 		WithStorages(defaultStorages(dir, smallSizeLimit)))
-	require.NoError(t, blobStor.Open(false))
+	require.NoError(t, blobStor.Open(context.Background(), false))
 	require.NoError(t, blobStor.Init())
 
 	testGet := func(t *testing.T, b *BlobStor, obj *objectSDK.Object) {
@@ -268,7 +268,7 @@ func TestConcurrentDelete(t *testing.T) {
 
 	blobStor := New(
 		WithStorages(defaultStorages(dir, smallSizeLimit)))
-	require.NoError(t, blobStor.Open(false))
+	require.NoError(t, blobStor.Open(context.Background(), false))
 	require.NoError(t, blobStor.Init())
 
 	testPut := func(t *testing.T, b *BlobStor, obj *objectSDK.Object) {

pkg/local_object_storage/blobstor/control.go

@@ -1,6 +1,7 @@
 package blobstor
 
 import (
+	"context"
 	"errors"
 	"fmt"
 
@@ -9,10 +10,15 @@ import (
 )
 
 // Open opens BlobStor.
-func (b *BlobStor) Open(readOnly bool) error {
+func (b *BlobStor) Open(ctx context.Context, readOnly bool) error {
 	b.log.Debug(logs.BlobstorOpening)
 
 	for i := range b.storage {
+		select {
+		case <-ctx.Done():
+			return ctx.Err()
+		default:
+		}
 		err := b.storage[i].Storage.Open(readOnly)
 		if err != nil {
 			return err

pkg/local_object_storage/blobstor/exists_test.go

@@ -20,7 +20,7 @@ func TestExists(t *testing.T) {
 
 	b := New(WithStorages(storages))
 
-	require.NoError(t, b.Open(false))
+	require.NoError(t, b.Open(context.Background(), false))
 	require.NoError(t, b.Init())
 
 	objects := []*objectSDK.Object{

pkg/local_object_storage/blobstor/iterate_test.go

@@ -26,7 +26,7 @@ func TestIterateObjects(t *testing.T) {
 	defer os.RemoveAll(p)
 
 	// open Blobstor
-	require.NoError(t, blobStor.Open(false))
+	require.NoError(t, blobStor.Open(context.Background(), false))
 
 	// initialize Blobstor
 	require.NoError(t, blobStor.Init())

pkg/local_object_storage/blobstor/mode.go

@@ -1,6 +1,7 @@
 package blobstor
 
 import (
+	"context"
 	"fmt"
 
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode"
@@ -21,7 +22,7 @@ func (b *BlobStor) SetMode(m mode.Mode) error {
 
 	err := b.Close()
 	if err == nil {
-		if err = b.Open(m.ReadOnly()); err == nil {
+		if err = b.Open(context.TODO(), m.ReadOnly()); err == nil {
 			err = b.Init()
 		}
 	}

pkg/local_object_storage/engine/control.go

@@ -21,11 +21,11 @@ type shardInitError struct {
 }
 
 // Open opens all StorageEngine's components.
-func (e *StorageEngine) Open() error {
+func (e *StorageEngine) Open(ctx context.Context) error {
-	return e.open()
+	return e.open(ctx)
 }
 
-func (e *StorageEngine) open() error {
+func (e *StorageEngine) open(ctx context.Context) error {
 	e.mtx.Lock()
 	defer e.mtx.Unlock()
 
@@ -36,7 +36,7 @@ func (e *StorageEngine) open() error {
 		wg.Add(1)
 		go func(id string, sh *shard.Shard) {
 			defer wg.Done()
-			if err := sh.Open(); err != nil {
+			if err := sh.Open(ctx); err != nil {
 				errCh <- shardInitError{
 					err: err,
 					id:  id,
@@ -148,10 +148,10 @@ var errClosed = errors.New("storage engine is closed")
 // After the call, all the next ones will fail.
 //
 // The method MUST only be called when the application exits.
-func (e *StorageEngine) Close() error {
+func (e *StorageEngine) Close(ctx context.Context) error {
 	close(e.closeCh)
 	defer e.wg.Wait()
-	return e.setBlockExecErr(errClosed)
+	return e.setBlockExecErr(ctx, errClosed)
 }
 
 // closes all shards. Never returns an error, shard errors are logged.
@@ -197,7 +197,7 @@ func (e *StorageEngine) execIfNotBlocked(op func() error) error {
 //   - otherwise, resumes execution. If exec was blocked, calls open method.
 //
 // Can be called concurrently with exec. In this case it waits for all executions to complete.
-func (e *StorageEngine) setBlockExecErr(err error) error {
+func (e *StorageEngine) setBlockExecErr(ctx context.Context, err error) error {
 	e.blockExec.mtx.Lock()
 	defer e.blockExec.mtx.Unlock()
 
@@ -212,7 +212,7 @@ func (e *StorageEngine) setBlockExecErr(err error) error {
 
 	if err == nil {
 		if prevErr != nil { // block -> ok
-			return e.open()
+			return e.open(ctx)
 		}
 	} else if prevErr == nil { // ok -> block
 		return e.close(errors.Is(err, errClosed))
@@ -235,7 +235,7 @@ func (e *StorageEngine) setBlockExecErr(err error) error {
 // Note: technically passing nil error will resume the execution, otherwise, it is recommended to call ResumeExecution
 // for this.
 func (e *StorageEngine) BlockExecution(err error) error {
-	return e.setBlockExecErr(err)
+	return e.setBlockExecErr(context.Background(), err)
 }
 
 // ResumeExecution resumes the execution of any data-related operation.
@@ -247,7 +247,7 @@ func (e *StorageEngine) BlockExecution(err error) error {
 //
 // Must not be called concurrently with either Open or Init.
 func (e *StorageEngine) ResumeExecution() error {
-	return e.setBlockExecErr(nil)
+	return e.setBlockExecErr(context.Background(), nil)
 }
 
 type ReConfiguration struct {
@@ -334,14 +334,14 @@ loop:
 	}
 
 	for _, newID := range shardsToAdd {
-		sh, err := e.createShard(rcfg.shards[newID])
+		sh, err := e.createShard(ctx, rcfg.shards[newID])
 		if err != nil {
 			return fmt.Errorf("could not add new shard with '%s' metabase path: %w", newID, err)
 		}
 
 		idStr := sh.ID().String()
 
-		err = sh.Open()
+		err = sh.Open(ctx)
 		if err == nil {
 			err = sh.Init(ctx)
 		}

pkg/local_object_storage/engine/control_test.go

@@ -126,7 +126,7 @@ func testEngineFailInitAndReload(t *testing.T, errOnAdd bool, opts []shard.Optio
 	var configID string
 
 	e := New()
-	_, err := e.AddShard(opts...)
+	_, err := e.AddShard(context.Background(), opts...)
 	if errOnAdd {
 		require.Error(t, err)
 		// This branch is only taken when we cannot update shard ID in the metabase.
@@ -144,7 +144,7 @@ func testEngineFailInitAndReload(t *testing.T, errOnAdd bool, opts []shard.Optio
 		configID = calculateShardID(e.shards[id].Shard.DumpInfo())
 		e.mtx.RUnlock()
 
-		err = e.Open()
+		err = e.Open(context.Background())
 		if err == nil {
 			require.Error(t, e.Init(context.Background()))
 		}
@@ -193,7 +193,7 @@ func TestExecBlocks(t *testing.T) {
 	require.NoError(t, err)
 
 	// close
-	require.NoError(t, e.Close())
+	require.NoError(t, e.Close(context.Background()))
 
 	// try exec after close
 	_, err = Head(context.Background(), e, addr)
@@ -209,13 +209,13 @@ func TestPersistentShardID(t *testing.T) {
 	te := newEngineWithErrorThreshold(t, dir, 1)
 
 	checkShardState(t, te.ng, te.shards[0].id, 0, mode.ReadWrite)
-	require.NoError(t, te.ng.Close())
+	require.NoError(t, te.ng.Close(context.Background()))
 
 	newTe := newEngineWithErrorThreshold(t, dir, 1)
 	for i := 0; i < len(newTe.shards); i++ {
 		require.Equal(t, te.shards[i].id, newTe.shards[i].id)
 	}
-	require.NoError(t, newTe.ng.Close())
+	require.NoError(t, newTe.ng.Close(context.Background()))
 
 	p1 := newTe.ng.shards[te.shards[0].id.String()].Shard.DumpInfo().MetaBaseInfo.Path
 	p2 := newTe.ng.shards[te.shards[1].id.String()].Shard.DumpInfo().MetaBaseInfo.Path
@@ -227,7 +227,7 @@ func TestPersistentShardID(t *testing.T) {
 	newTe = newEngineWithErrorThreshold(t, dir, 1)
 	require.Equal(t, te.shards[1].id, newTe.shards[0].id)
 	require.Equal(t, te.shards[0].id, newTe.shards[1].id)
-	require.NoError(t, newTe.ng.Close())
+	require.NoError(t, newTe.ng.Close(context.Background()))
 
 }
 
@@ -313,7 +313,7 @@ func engineWithShards(t *testing.T, path string, num int) (*StorageEngine, []str
 	require.Equal(t, num, len(e.shards))
 	require.Equal(t, num, len(e.shardPools))
 
-	require.NoError(t, e.Open())
+	require.NoError(t, e.Open(context.Background()))
 	require.NoError(t, e.Init(context.Background()))
 
 	return e, currShards

pkg/local_object_storage/engine/delete_test.go

@@ -54,7 +54,7 @@ func TestDeleteBigObject(t *testing.T) {
 
 	e := testNewEngine(t).setInitializedShards(t, s1, s2, s3).engine
 	e.log = test.NewLogger(t, true)
-	defer e.Close()
+	defer e.Close(context.Background())
 
 	for i := range children {
 		require.NoError(t, Put(context.Background(), e, children[i]))

pkg/local_object_storage/engine/engine_test.go

@@ -50,7 +50,7 @@ func benchmarkExists(b *testing.B, shardNum int) {
 
 	e := testNewEngine(b).setInitializedShards(b, shards...).engine
 	b.Cleanup(func() {
-		_ = e.Close()
+		_ = e.Close(context.Background())
 		_ = os.RemoveAll(b.Name())
 	})
 
@@ -119,7 +119,7 @@ func (te *testEngineWrapper) setShardsNum(t testing.TB, num int) *testEngineWrap
 func (te *testEngineWrapper) setShardsNumOpts(t testing.TB, num int, shardOpts func(id int) []shard.Option) *testEngineWrapper {
 	for i := 0; i < num; i++ {
 		opts := shardOpts(i)
-		id, err := te.engine.AddShard(opts...)
+		id, err := te.engine.AddShard(context.Background(), opts...)
 		require.NoError(t, err)
 		te.shardIDs = append(te.shardIDs, id)
 	}
@@ -130,7 +130,7 @@ func (te *testEngineWrapper) setShardsNumAdditionalOpts(t testing.TB, num int, s
 	for i := 0; i < num; i++ {
 		defaultOpts := testDefaultShardOptions(t, i)
 		opts := append(defaultOpts, shardOpts(i)...)
-		id, err := te.engine.AddShard(opts...)
+		id, err := te.engine.AddShard(context.Background(), opts...)
 		require.NoError(t, err)
 		te.shardIDs = append(te.shardIDs, id)
 	}
@@ -190,7 +190,7 @@ func testNewShard(t testing.TB, id int) *shard.Shard {
 	shardOpts := append([]shard.Option{shard.WithID(sid)}, testDefaultShardOptions(t, id)...)
 	s := shard.New(shardOpts...)
 
-	require.NoError(t, s.Open())
+	require.NoError(t, s.Open(context.Background()))
 	require.NoError(t, s.Init(context.Background()))
 
 	return s

pkg/local_object_storage/engine/error_test.go

@@ -68,7 +68,7 @@ func newEngineWithErrorThreshold(t testing.TB, dir string, errThreshold uint32)
 			}
 		})
 	e := te.engine
-	require.NoError(t, e.Open())
+	require.NoError(t, e.Open(context.Background()))
 	require.NoError(t, e.Init(context.Background()))
 
 	for i, id := range te.shardIDs {
@@ -192,7 +192,7 @@ func TestBlobstorFailback(t *testing.T) {
 	}
 
 	checkShardState(t, te.ng, te.shards[0].id, 0, mode.ReadWrite)
-	require.NoError(t, te.ng.Close())
+	require.NoError(t, te.ng.Close(context.Background()))
 
 	p1 := te.ng.shards[te.shards[0].id.String()].Shard.DumpInfo().BlobStorInfo.SubStorages[1].Path
 	p2 := te.ng.shards[te.shards[1].id.String()].Shard.DumpInfo().BlobStorInfo.SubStorages[1].Path
@@ -217,7 +217,7 @@ func TestBlobstorFailback(t *testing.T) {
 		require.True(t, shard.IsErrOutOfRange(err))
 	}
 
-	checkShardState(t, te.ng, te.shards[0].id, 2, mode.ReadOnly)
+	checkShardState(t, te.ng, te.shards[0].id, 0, mode.ReadWrite)
 	checkShardState(t, te.ng, te.shards[1].id, 0, mode.ReadWrite)
 }
 

pkg/local_object_storage/engine/evacuate_test.go

@@ -44,7 +44,7 @@ func newEngineEvacuate(t *testing.T, shardNum int, objPerShard int) (*StorageEng
 			}
 		})
 	e, ids := te.engine, te.shardIDs
-	require.NoError(t, e.Open())
+	require.NoError(t, e.Open(context.Background()))
 	require.NoError(t, e.Init(context.Background()))
 
 	objects := make([]*objectSDK.Object, 0, objPerShard*len(ids))

pkg/local_object_storage/engine/get.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 
+	"git.frostfs.info/TrueCloudLab/frostfs-node/internal/logs"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr"
@@ -100,9 +101,11 @@ func (e *StorageEngine) get(ctx context.Context, prm GetPrm) (GetRes, error) {
 		if it.Object == nil {
 			return GetRes{}, it.OutError
 		}
-		if it.ShardWithMeta.Shard != nil {
+		if it.ShardWithMeta.Shard != nil && it.MetaError != nil {
-			e.reportShardError(it.ShardWithMeta, "meta info was present, but object is missing",
+			e.log.Warn(logs.ShardMetaInfoPresentButObjectNotFound,
-				it.MetaError, zap.Stringer("address", prm.addr))
+				zap.Stringer("shard_id", it.ShardWithMeta.ID()),
+				zap.String("error", it.MetaError.Error()),
+				zap.Stringer("address", prm.addr))
 		}
 	}
 

pkg/local_object_storage/engine/head_test.go

@@ -43,7 +43,7 @@ func TestHeadRaw(t *testing.T) {
 		s2 := testNewShard(t, 2)
 
 		e := testNewEngine(t).setInitializedShards(t, s1, s2).engine
-		defer e.Close()
+		defer e.Close(context.Background())
 
 		var putPrmLeft shard.PutPrm
 		putPrmLeft.SetObject(child)

pkg/local_object_storage/engine/inhume_test.go

@@ -37,7 +37,7 @@ func TestStorageEngine_Inhume(t *testing.T) {
 
 	t.Run("delete small object", func(t *testing.T) {
 		e := testNewEngine(t).setShardsNum(t, 1).engine
-		defer e.Close()
+		defer e.Close(context.Background())
 
 		err := Put(context.Background(), e, parent)
 		require.NoError(t, err)
@@ -58,7 +58,7 @@ func TestStorageEngine_Inhume(t *testing.T) {
 		s2 := testNewShard(t, 2)
 
 		e := testNewEngine(t).setInitializedShards(t, s1, s2).engine
-		defer e.Close()
+		defer e.Close(context.Background())
 
 		var putChild shard.PutPrm
 		putChild.SetObject(child)

pkg/local_object_storage/engine/list_test.go

@@ -76,11 +76,11 @@ func TestListWithCursor(t *testing.T) {
 						meta.WithEpochState(epochState{}),
 					)}
 			}).engine
-			require.NoError(t, e.Open())
+			require.NoError(t, e.Open(context.Background()))
 			require.NoError(t, e.Init(context.Background()))
 
 			t.Cleanup(func() {
-				e.Close()
+				e.Close(context.Background())
 			})
 
 			expected := make([]object.AddressWithType, 0, tt.objectNum)

pkg/local_object_storage/engine/lock_test.go

@@ -59,11 +59,11 @@ func TestLockUserScenario(t *testing.T) {
 			}
 		})
 	e := testEngine.engine
-	require.NoError(t, e.Open())
+	require.NoError(t, e.Open(context.Background()))
 	require.NoError(t, e.Init(context.Background()))
 
 	t.Cleanup(func() {
-		_ = e.Close()
+		_ = e.Close(context.Background())
 	})
 
 	lockerID := oidtest.ID()
@@ -167,11 +167,11 @@ func TestLockExpiration(t *testing.T) {
 			}
 		})
 	e := testEngine.engine
-	require.NoError(t, e.Open())
+	require.NoError(t, e.Open(context.Background()))
 	require.NoError(t, e.Init(context.Background()))
 
 	t.Cleanup(func() {
-		_ = e.Close()
+		_ = e.Close(context.Background())
 	})
 
 	const lockerExpiresAfter = 13
@@ -247,10 +247,10 @@ func TestLockForceRemoval(t *testing.T) {
 				shard.WithDeletedLockCallback(e.processDeletedLocks),
 			}
 		}).engine
-	require.NoError(t, e.Open())
+	require.NoError(t, e.Open(context.Background()))
 	require.NoError(t, e.Init(context.Background()))
 	t.Cleanup(func() {
-		_ = e.Close()
+		_ = e.Close(context.Background())
 	})
 
 	cnr := cidtest.ID()

pkg/local_object_storage/engine/range.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"strconv"
 
+	"git.frostfs.info/TrueCloudLab/frostfs-node/internal/logs"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr"
@@ -113,9 +114,10 @@ func (e *StorageEngine) getRange(ctx context.Context, prm RngPrm) (RngRes, error
 		if it.Object == nil {
 			return RngRes{}, it.OutError
 		}
-		if it.ShardWithMeta.Shard != nil {
+		if it.ShardWithMeta.Shard != nil && it.MetaError != nil {
-			e.reportShardError(it.ShardWithMeta, "meta info was present, but object is missing",
+			e.log.Warn(logs.ShardMetaInfoPresentButObjectNotFound,
-				it.MetaError,
+				zap.Stringer("shard_id", it.ShardWithMeta.ID()),
+				zap.String("error", it.MetaError.Error()),
 				zap.Stringer("address", prm.addr))
 		}
 	}

pkg/local_object_storage/engine/shards.go

@@ -1,6 +1,7 @@
 package engine
 
 import (
+	"context"
 	"fmt"
 	"sync/atomic"
 
@@ -77,8 +78,8 @@ func (m *metricsWithID) DeleteShardMetrics() {
 //
 // Returns any error encountered that did not allow adding a shard.
 // Otherwise returns the ID of the added shard.
-func (e *StorageEngine) AddShard(opts ...shard.Option) (*shard.ID, error) {
+func (e *StorageEngine) AddShard(ctx context.Context, opts ...shard.Option) (*shard.ID, error) {
-	sh, err := e.createShard(opts)
+	sh, err := e.createShard(ctx, opts)
 	if err != nil {
 		return nil, fmt.Errorf("could not create a shard: %w", err)
 	}
@@ -95,7 +96,7 @@ func (e *StorageEngine) AddShard(opts ...shard.Option) (*shard.ID, error) {
 	return sh.ID(), nil
 }
 
-func (e *StorageEngine) createShard(opts []shard.Option) (*shard.Shard, error) {
+func (e *StorageEngine) createShard(ctx context.Context, opts []shard.Option) (*shard.Shard, error) {
 	id, err := generateShardID()
 	if err != nil {
 		return nil, fmt.Errorf("could not generate shard ID: %w", err)
@@ -111,7 +112,7 @@ func (e *StorageEngine) createShard(opts []shard.Option) (*shard.Shard, error) {
 		shard.WithReportErrorFunc(e.reportShardErrorBackground),
 	)...)
 
-	if err := sh.UpdateID(); err != nil {
+	if err := sh.UpdateID(ctx); err != nil {
 		return nil, fmt.Errorf("could not update shard ID: %w", err)
 	}
 

pkg/local_object_storage/engine/shards_test.go

@@ -1,6 +1,7 @@
 package engine
 
 import (
+	"context"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -12,7 +13,7 @@ func TestRemoveShard(t *testing.T) {
 	te := testNewEngine(t).setShardsNum(t, numOfShards)
 	e, ids := te.engine, te.shardIDs
 	t.Cleanup(func() {
-		e.Close()
+		e.Close(context.Background())
 	})
 
 	require.Equal(t, numOfShards, len(e.shardPools))

pkg/local_object_storage/internal/storagetest/storage.go

@@ -1,6 +1,7 @@
 package storagetest
 
 import (
+	"context"
 	"testing"
 
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode"
@@ -9,7 +10,7 @@ import (
 
 // Component represents single storage component.
 type Component interface {
-	Open(bool) error
+	Open(context.Context, bool) error
 	SetMode(mode.Mode) error
 	Init() error
 	Close() error
@@ -57,18 +58,18 @@ func TestCloseAfterOpen(t *testing.T, cons Constructor) {
 	t.Run("RW", func(t *testing.T) {
 		// Use-case: irrecoverable error on some components, close everything.
 		s := cons(t)
-		require.NoError(t, s.Open(false))
+		require.NoError(t, s.Open(context.Background(), false))
 		require.NoError(t, s.Close())
 	})
 	t.Run("RO", func(t *testing.T) {
 		// Use-case: irrecoverable error on some components, close everything.
 		// Open in read-only must be done after the db is here.
 		s := cons(t)
-		require.NoError(t, s.Open(false))
+		require.NoError(t, s.Open(context.Background(), false))
 		require.NoError(t, s.Init())
 		require.NoError(t, s.Close())
 
-		require.NoError(t, s.Open(true))
+		require.NoError(t, s.Open(context.Background(), true))
 		require.NoError(t, s.Close())
 	})
 }
@@ -77,7 +78,7 @@ func TestCloseAfterOpen(t *testing.T, cons Constructor) {
 func TestCloseTwice(t *testing.T, cons Constructor) {
 	// Use-case: move to maintenance mode twice, first time failed.
 	s := cons(t)
-	require.NoError(t, s.Open(false))
+	require.NoError(t, s.Open(context.Background(), false))
 	require.NoError(t, s.Init())
 	require.NoError(t, s.Close())
 	require.NoError(t, s.Close()) // already closed, no-op
@@ -89,12 +90,12 @@ func TestSetMode(t *testing.T, cons Constructor, m mode.Mode) {
 		// Use-case: metabase `Init` failed,
 		// call `SetMode` on all not-yet-initialized components.
 		s := cons(t)
-		require.NoError(t, s.Open(false))
+		require.NoError(t, s.Open(context.Background(), false))
 		require.NoError(t, s.SetMode(m))
 
 		t.Run("after open in RO", func(t *testing.T) {
 			require.NoError(t, s.Close())
-			require.NoError(t, s.Open(true))
+			require.NoError(t, s.Open(context.Background(), true))
 			require.NoError(t, s.SetMode(m))
 		})
 
@@ -103,7 +104,7 @@ func TestSetMode(t *testing.T, cons Constructor, m mode.Mode) {
 	t.Run("after init", func(t *testing.T) {
 		s := cons(t)
 		// Use-case: notmal node operation.
-		require.NoError(t, s.Open(false))
+		require.NoError(t, s.Open(context.Background(), false))
 		require.NoError(t, s.Init())
 		require.NoError(t, s.SetMode(m))
 		require.NoError(t, s.Close())
@@ -113,7 +114,7 @@ func TestSetMode(t *testing.T, cons Constructor, m mode.Mode) {
 func TestModeTransition(t *testing.T, cons Constructor, from, to mode.Mode) {
 	// Use-case: normal node operation.
 	s := cons(t)
-	require.NoError(t, s.Open(false))
+	require.NoError(t, s.Open(context.Background(), false))
 	require.NoError(t, s.Init())
 	require.NoError(t, s.SetMode(from))
 	require.NoError(t, s.SetMode(to))

pkg/local_object_storage/metabase/control.go

@@ -1,6 +1,7 @@
 package meta
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"path/filepath"
@@ -21,7 +22,7 @@ var ErrDegradedMode = logicerr.New("metabase is in a degraded mode")
 var ErrReadOnlyMode = logicerr.New("metabase is in a read-only mode")
 
 // Open boltDB instance for metabase.
-func (db *DB) Open(readOnly bool) error {
+func (db *DB) Open(_ context.Context, readOnly bool) error {
 	err := util.MkdirAllX(filepath.Dir(db.info.Path), db.info.Permission)
 	if err != nil {
 		return fmt.Errorf("can't create dir %s for metabase: %w", db.info.Path, err)

pkg/local_object_storage/metabase/db_test.go

@@ -1,6 +1,7 @@
 package meta_test
 
 import (
+	"context"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -49,7 +50,7 @@ func newDB(t testing.TB, opts ...meta.Option) *meta.DB {
 		}, opts...)...,
 	)
 
-	require.NoError(t, bdb.Open(false))
+	require.NoError(t, bdb.Open(context.Background(), false))
 	require.NoError(t, bdb.Init())
 
 	t.Cleanup(func() {

pkg/local_object_storage/metabase/mode.go

@@ -1,6 +1,7 @@
 package meta
 
 import (
+	"context"
 	"fmt"
 
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode"
@@ -27,9 +28,9 @@ func (db *DB) SetMode(m mode.Mode) error {
 	case m.NoMetabase():
 		db.boltDB = nil
 	case m.ReadOnly():
-		err = db.Open(true)
+		err = db.Open(context.TODO(), true)
 	default:
-		err = db.Open(false)
+		err = db.Open(context.TODO(), false)
 	}
 	if err == nil && !m.NoMetabase() && !m.ReadOnly() {
 		err = db.Init()

pkg/local_object_storage/metabase/version_test.go

@@ -1,6 +1,7 @@
 package meta
 
 import (
+	"context"
 	"encoding/binary"
 	"errors"
 	"fmt"
@@ -42,13 +43,13 @@ func TestVersion(t *testing.T) {
 	}
 	t.Run("simple", func(t *testing.T) {
 		db := newDB(t)
-		require.NoError(t, db.Open(false))
+		require.NoError(t, db.Open(context.Background(), false))
 		require.NoError(t, db.Init())
 		check(t, db)
 		require.NoError(t, db.Close())
 
 		t.Run("reopen", func(t *testing.T) {
-			require.NoError(t, db.Open(false))
+			require.NoError(t, db.Open(context.Background(), false))
 			require.NoError(t, db.Init())
 			check(t, db)
 			require.NoError(t, db.Close())
@@ -56,29 +57,29 @@ func TestVersion(t *testing.T) {
 	})
 	t.Run("old data", func(t *testing.T) {
 		db := newDB(t)
-		require.NoError(t, db.Open(false))
+		require.NoError(t, db.Open(context.Background(), false))
 		require.NoError(t, db.WriteShardID([]byte{1, 2, 3, 4}))
 		require.NoError(t, db.Close())
 
-		require.NoError(t, db.Open(false))
+		require.NoError(t, db.Open(context.Background(), false))
 		require.NoError(t, db.Init())
 		check(t, db)
 		require.NoError(t, db.Close())
 	})
 	t.Run("invalid version", func(t *testing.T) {
 		db := newDB(t)
-		require.NoError(t, db.Open(false))
+		require.NoError(t, db.Open(context.Background(), false))
 		require.NoError(t, db.boltDB.Update(func(tx *bbolt.Tx) error {
 			return updateVersion(tx, version+1)
 		}))
 		require.NoError(t, db.Close())
 
-		require.NoError(t, db.Open(false))
+		require.NoError(t, db.Open(context.Background(), false))
 		require.Error(t, db.Init())
 		require.NoError(t, db.Close())
 
 		t.Run("reset", func(t *testing.T) {
-			require.NoError(t, db.Open(false))
+			require.NoError(t, db.Open(context.Background(), false))
 			require.NoError(t, db.Reset())
 			check(t, db)
 			require.NoError(t, db.Close())

pkg/local_object_storage/pilorama/bench_test.go

@@ -26,7 +26,7 @@ func BenchmarkCreate(b *testing.B) {
 	f := NewBoltForest(
 		WithPath(filepath.Join(tmpDir, "test.db")),
 		WithMaxBatchSize(runtime.GOMAXPROCS(0)))
-	require.NoError(b, f.Open(false))
+	require.NoError(b, f.Open(context.Background(), false))
 	require.NoError(b, f.Init())
 	b.Cleanup(func() {
 		require.NoError(b, f.Close())

pkg/local_object_storage/pilorama/boltdb.go

@@ -99,7 +99,7 @@ func (t *boltForest) SetMode(m mode.Mode) error {
 
 	err := t.Close()
 	if err == nil && !m.NoMetabase() {
-		if err = t.Open(m.ReadOnly()); err == nil {
+		if err = t.Open(context.TODO(), m.ReadOnly()); err == nil {
 			err = t.Init()
 		}
 	}
@@ -111,7 +111,7 @@ func (t *boltForest) SetMode(m mode.Mode) error {
 	t.metrics.SetMode(m)
 	return nil
 }
-func (t *boltForest) Open(readOnly bool) error {
+func (t *boltForest) Open(_ context.Context, readOnly bool) error {
 	err := util.MkdirAllX(filepath.Dir(t.path), t.perm)
 	if err != nil {
 		return metaerr.Wrap(fmt.Errorf("can't create dir %s for the pilorama: %w", t.path, err))

pkg/local_object_storage/pilorama/forest.go

@@ -110,7 +110,7 @@ func (f *memoryForest) Init() error {
 	return nil
 }
 
-func (f *memoryForest) Open(bool) error {
+func (f *memoryForest) Open(context.Context, bool) error {
 	return nil
 }
 func (f *memoryForest) SetMode(mode.Mode) error {

pkg/local_object_storage/pilorama/forest_test.go

@@ -24,7 +24,7 @@ var providers = []struct {
 }{
 	{"inmemory", func(t testing.TB, _ ...Option) Forest {
 		f := NewMemoryForest()
-		require.NoError(t, f.Open(false))
+		require.NoError(t, f.Open(context.Background(), false))
 		require.NoError(t, f.Init())
 		t.Cleanup(func() {
 			require.NoError(t, f.Close())
@@ -37,7 +37,7 @@ var providers = []struct {
 			append([]Option{
 				WithPath(filepath.Join(t.TempDir(), "test.db")),
 				WithMaxBatchSize(1)}, opts...)...)
-		require.NoError(t, f.Open(false))
+		require.NoError(t, f.Open(context.Background(), false))
 		require.NoError(t, f.Init())
 		t.Cleanup(func() {
 			require.NoError(t, f.Close())

pkg/local_object_storage/pilorama/interface.go

@@ -58,7 +58,7 @@ type ForestStorage interface {
 	// DumpInfo returns information about the pilorama.
 	DumpInfo() Info
 	Init() error
-	Open(bool) error
+	Open(context.Context, bool) error
 	Close() error
 	SetMode(m mode.Mode) error
 	SetParentID(id string)

pkg/local_object_storage/shard/control.go

@@ -41,8 +41,10 @@ func (s *Shard) handleMetabaseFailure(stage string, err error) error {
 }
 
 // Open opens all Shard's components.
-func (s *Shard) Open() error {
+func (s *Shard) Open(ctx context.Context) error {
-	components := []interface{ Open(bool) error }{
+	components := []interface {
+		Open(context.Context, bool) error
+	}{
 		s.blobStor, s.metaBase,
 	}
 
@@ -55,12 +57,12 @@ func (s *Shard) Open() error {
 	}
 
 	for i, component := range components {
-		if err := component.Open(false); err != nil {
+		if err := component.Open(ctx, false); err != nil {
 			if component == s.metaBase {
 				// We must first open all other components to avoid
 				// opening non-existent DB in read-only mode.
 				for j := i + 1; j < len(components); j++ {
-					if err := components[j].Open(false); err != nil {
+					if err := components[j].Open(ctx, false); err != nil {
 						// Other components must be opened, fail.
 						return fmt.Errorf("could not open %T: %w", components[j], err)
 					}

pkg/local_object_storage/shard/control_test.go

@@ -32,12 +32,6 @@ import (
 	"go.etcd.io/bbolt"
 )
 
-type epochState struct{}
-
-func (s epochState) CurrentEpoch() uint64 {
-	return 0
-}
-
 type objAddr struct {
 	obj  *objectSDK.Object
 	addr oid.Address
@@ -93,7 +87,7 @@ func TestShardOpen(t *testing.T) {
 	allowedMode.Store(int64(os.O_RDWR))
 
 	sh := newShard()
-	require.NoError(t, sh.Open())
+	require.NoError(t, sh.Open(context.Background()))
 	require.NoError(t, sh.Init(context.Background()))
 	require.Equal(t, mode.ReadWrite, sh.GetMode())
 	require.NoError(t, sh.Close())
@@ -102,7 +96,7 @@ func TestShardOpen(t *testing.T) {
 	allowedMode.Store(int64(os.O_RDONLY))
 
 	sh = newShard()
-	require.NoError(t, sh.Open())
+	require.NoError(t, sh.Open(context.Background()))
 	require.NoError(t, sh.Init(context.Background()))
 	require.Equal(t, mode.ReadOnly, sh.GetMode())
 	require.Error(t, sh.SetMode(mode.ReadWrite))
@@ -113,7 +107,7 @@ func TestShardOpen(t *testing.T) {
 	allowedMode.Store(math.MaxInt64)
 
 	sh = newShard()
-	require.NoError(t, sh.Open())
+	require.NoError(t, sh.Open(context.Background()))
 	require.NoError(t, sh.Init(context.Background()))
 	require.Equal(t, mode.DegradedReadOnly, sh.GetMode())
 	require.NoError(t, sh.Close())
@@ -141,7 +135,7 @@ func TestRefillMetabaseCorrupted(t *testing.T) {
 		WithBlobStorOptions(blobOpts...),
 		WithPiloramaOptions(pilorama.WithPath(filepath.Join(dir, "pilorama"))),
 		WithMetaBaseOptions(meta.WithPath(filepath.Join(dir, "meta")), meta.WithEpochState(epochState{})))
-	require.NoError(t, sh.Open())
+	require.NoError(t, sh.Open(context.Background()))
 	require.NoError(t, sh.Init(context.Background()))
 
 	obj := objecttest.Object()
@@ -164,7 +158,7 @@ func TestRefillMetabaseCorrupted(t *testing.T) {
 		WithPiloramaOptions(pilorama.WithPath(filepath.Join(dir, "pilorama"))),
 		WithMetaBaseOptions(meta.WithPath(filepath.Join(dir, "meta_new")), meta.WithEpochState(epochState{})),
 		WithRefillMetabase(true))
-	require.NoError(t, sh.Open())
+	require.NoError(t, sh.Open(context.Background()))
 	require.NoError(t, sh.Init(context.Background()))
 
 	var getPrm GetPrm
@@ -203,7 +197,7 @@ func TestRefillMetabase(t *testing.T) {
 	)
 
 	// open Blobstor
-	require.NoError(t, sh.Open())
+	require.NoError(t, sh.Open(context.Background()))
 
 	// initialize Blobstor
 	require.NoError(t, sh.Init(context.Background()))
@@ -371,7 +365,7 @@ func TestRefillMetabase(t *testing.T) {
 	)
 
 	// open Blobstor
-	require.NoError(t, sh.Open())
+	require.NoError(t, sh.Open(context.Background()))
 
 	// initialize Blobstor
 	require.NoError(t, sh.Init(context.Background()))

pkg/local_object_storage/shard/delete_test.go

@@ -1,4 +1,4 @@
-package shard_test
+package shard
 
 import (
 	"context"
@@ -7,7 +7,6 @@ import (
 
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil"
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client"
 	cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test"
 	"github.com/stretchr/testify/require"
@@ -29,15 +28,14 @@ func TestShard_Delete(t *testing.T) {
 
 func testShardDelete(t *testing.T, hasWriteCache bool) {
 	sh := newShard(t, hasWriteCache)
-	defer releaseShard(sh, t)
 
 	cnr := cidtest.ID()
 
 	obj := testutil.GenerateObjectWithCID(cnr)
 	testutil.AddAttribute(obj, "foo", "bar")
 
-	var putPrm shard.PutPrm
+	var putPrm PutPrm
-	var getPrm shard.GetPrm
+	var getPrm GetPrm
 
 	t.Run("big object", func(t *testing.T) {
 		testutil.AddPayload(obj, 1<<20)
@@ -45,7 +43,7 @@ func testShardDelete(t *testing.T, hasWriteCache bool) {
 		putPrm.SetObject(obj)
 		getPrm.SetAddress(object.AddressOf(obj))
 
-		var delPrm shard.DeletePrm
+		var delPrm DeletePrm
 		delPrm.SetAddresses(object.AddressOf(obj))
 
 		_, err := sh.Put(context.Background(), putPrm)
@@ -71,7 +69,7 @@ func testShardDelete(t *testing.T, hasWriteCache bool) {
 		putPrm.SetObject(obj)
 		getPrm.SetAddress(object.AddressOf(obj))
 
-		var delPrm shard.DeletePrm
+		var delPrm DeletePrm
 		delPrm.SetAddresses(object.AddressOf(obj))
 
 		_, err := sh.Put(context.Background(), putPrm)

pkg/local_object_storage/shard/gc.go

@@ -119,6 +119,8 @@ type gcCfg struct {
 	expiredCollectorBatchSize    int
 
 	metrics GCMectrics
+
+	testHookRemover func(ctx context.Context) gcRunResult
 }
 
 func defaultGCCfg() gcCfg {
@@ -158,33 +160,37 @@ func (gc *gc) listenEvents(ctx context.Context) {
 			return
 		}
 
-		v, ok := gc.mEventHandler[event.typ()]
+		gc.handleEvent(ctx, event)
-		if !ok {
+	}
-			continue
+}
-		}
 
-		v.cancelFunc()
+func (gc *gc) handleEvent(ctx context.Context, event Event) {
-		v.prevGroup.Wait()
+	v, ok := gc.mEventHandler[event.typ()]
+	if !ok {
+		return
+	}
 
-		var runCtx context.Context
+	v.cancelFunc()
-		runCtx, v.cancelFunc = context.WithCancel(ctx)
+	v.prevGroup.Wait()
 
-		v.prevGroup.Add(len(v.handlers))
+	var runCtx context.Context
+	runCtx, v.cancelFunc = context.WithCancel(ctx)
 
-		for i := range v.handlers {
+	v.prevGroup.Add(len(v.handlers))
-			h := v.handlers[i]
 
-			err := gc.workerPool.Submit(func() {
+	for i := range v.handlers {
-				defer v.prevGroup.Done()
+		h := v.handlers[i]
-				h(runCtx, event)
-			})
-			if err != nil {
-				gc.log.Warn(logs.ShardCouldNotSubmitGCJobToWorkerPool,
-					zap.String("error", err.Error()),
-				)
 
-				v.prevGroup.Done()
+		err := gc.workerPool.Submit(func() {
-			}
+			defer v.prevGroup.Done()
+			h(runCtx, event)
+		})
+		if err != nil {
+			gc.log.Warn(logs.ShardCouldNotSubmitGCJobToWorkerPool,
+				zap.String("error", err.Error()),
+			)
+
+			v.prevGroup.Done()
 		}
 	}
 }
@@ -209,7 +215,12 @@ func (gc *gc) tickRemover(ctx context.Context) {
 		case <-timer.C:
 			startedAt := time.Now()
 
-			result := gc.remover(ctx)
+			var result gcRunResult
+			if gc.testHookRemover != nil {
+				result = gc.testHookRemover(ctx)
+			} else {
+				result = gc.remover(ctx)
+			}
 			timer.Reset(gc.removerInterval)
 
 			gc.metrics.AddRunDuration(time.Since(startedAt), result.success)
@@ -220,7 +231,7 @@ func (gc *gc) tickRemover(ctx context.Context) {
 
 func (gc *gc) stop() {
 	gc.onceStop.Do(func() {
-		gc.stopChannel <- struct{}{}
+		close(gc.stopChannel)
 	})
 
 	gc.log.Info(logs.ShardWaitingForGCWorkersToStop)

pkg/local_object_storage/shard/gc_internal_test.go

@@ -75,8 +75,8 @@ func Test_ObjectNotFoundIfNotDeletedFromMetabase(t *testing.T) {
 	}
 
 	sh = New(opts...)
-
+	sh.gcCfg.testHookRemover = func(context.Context) gcRunResult { return gcRunResult{} }
-	require.NoError(t, sh.Open())
+	require.NoError(t, sh.Open(context.Background()))
 	require.NoError(t, sh.Init(context.Background()))
 
 	t.Cleanup(func() {
@@ -116,13 +116,13 @@ func Test_ObjectNotFoundIfNotDeletedFromMetabase(t *testing.T) {
 	storageID, err := sh.metaBase.StorageID(context.Background(), metaStIDPrm)
 	require.NoError(t, err, "failed to get storage ID")
 
-	//check existance in blobstore
+	//check existence in blobstore
 	var bsExisted common.ExistsPrm
 	bsExisted.Address = addr
 	bsExisted.StorageID = storageID.StorageID()
 	exRes, err := sh.blobStor.Exists(context.Background(), bsExisted)
-	require.NoError(t, err, "failed to check blobstore existance")
+	require.NoError(t, err, "failed to check blobstore existence")
-	require.True(t, exRes.Exists, "invalid blobstore existance result")
+	require.True(t, exRes.Exists, "invalid blobstore existence result")
 
 	//drop from blobstor
 	var bsDeletePrm common.DeletePrm
@@ -131,10 +131,10 @@ func Test_ObjectNotFoundIfNotDeletedFromMetabase(t *testing.T) {
 	_, err = sh.blobStor.Delete(context.Background(), bsDeletePrm)
 	require.NoError(t, err, "failed to delete from blobstore")
 
-	//check existance in blobstore
+	//check existence in blobstore
 	exRes, err = sh.blobStor.Exists(context.Background(), bsExisted)
-	require.NoError(t, err, "failed to check blobstore existance")
+	require.NoError(t, err, "failed to check blobstore existence")
-	require.False(t, exRes.Exists, "invalid blobstore existance result")
+	require.False(t, exRes.Exists, "invalid blobstore existence result")
 
 	//get should return object not found
 	_, err = sh.Get(context.Background(), getPrm)

pkg/local_object_storage/shard/gc_test.go

@@ -1,17 +1,15 @@
-package shard_test
+package shard
 
 import (
 	"context"
 	"errors"
 	"testing"
-	"time"
 
 	objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object"
 	objectCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object"
 	"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"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util"
-	writecacheconfig "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache/config"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client"
 	cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test"
 	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
@@ -27,13 +25,11 @@ func Test_GCDropsLockedExpiredSimpleObject(t *testing.T) {
 		Value: 100,
 	}
 
-	wcOpts := writecacheconfig.Options{
+	sh := newCustomShard(t, false, shardOptions{
-		Type: writecacheconfig.TypeBBolt,
+		metaOptions: []meta.Option{meta.WithEpochState(epoch)},
-	}
+		additionalShardOptions: []Option{WithGCWorkerPoolInitializer(func(int) util.WorkerPool {
-	sh := newCustomShard(t, t.TempDir(), false, wcOpts, nil, []meta.Option{meta.WithEpochState(epoch)})
+			return util.NewPseudoWorkerPool() // synchronous event processing
-
+		})},
-	t.Cleanup(func() {
-		releaseShard(sh, t)
 	})
 
 	cnr := cidtest.ID()
@@ -55,7 +51,7 @@ func Test_GCDropsLockedExpiredSimpleObject(t *testing.T) {
 	lock.SetAttributes(lockExpirationAttr)
 	lockID, _ := lock.ID()
 
-	var putPrm shard.PutPrm
+	var putPrm PutPrm
 	putPrm.SetObject(obj)
 
 	_, err := sh.Put(context.Background(), putPrm)
@@ -69,14 +65,12 @@ func Test_GCDropsLockedExpiredSimpleObject(t *testing.T) {
 	require.NoError(t, err)
 
 	epoch.Value = 105
-	sh.NotificationChannel() <- shard.EventNewEpoch(epoch.Value)
+	sh.gc.handleEvent(context.Background(), EventNewEpoch(epoch.Value))
 
-	var getPrm shard.GetPrm
+	var getPrm GetPrm
 	getPrm.SetAddress(objectCore.AddressOf(obj))
-	require.Eventually(t, func() bool {
+	_, err = sh.Get(context.Background(), getPrm)
-		_, err = sh.Get(context.Background(), getPrm)
+	require.True(t, client.IsErrObjectNotFound(err), "expired object must be deleted")
-		return client.IsErrObjectNotFound(err)
-	}, 3*time.Second, 1*time.Second, "expired object must be deleted")
 }
 
 func Test_GCDropsLockedExpiredComplexObject(t *testing.T) {
@@ -127,13 +121,11 @@ func Test_GCDropsLockedExpiredComplexObject(t *testing.T) {
 
 	linkID, _ := link.ID()
 
-	wcOpts := writecacheconfig.Options{
+	sh := newCustomShard(t, false, shardOptions{
-		Type: writecacheconfig.TypeBBolt,
+		metaOptions: []meta.Option{meta.WithEpochState(epoch)},
-	}
+		additionalShardOptions: []Option{WithGCWorkerPoolInitializer(func(int) util.WorkerPool {
-	sh := newCustomShard(t, t.TempDir(), false, wcOpts, nil, []meta.Option{meta.WithEpochState(epoch)})
+			return util.NewPseudoWorkerPool() // synchronous event processing
-
+		})},
-	t.Cleanup(func() {
-		releaseShard(sh, t)
 	})
 
 	lock := testutil.GenerateObjectWithCID(cnr)
@@ -141,7 +133,7 @@ func Test_GCDropsLockedExpiredComplexObject(t *testing.T) {
 	lock.SetAttributes(lockExpirationAttr)
 	lockID, _ := lock.ID()
 
-	var putPrm shard.PutPrm
+	var putPrm PutPrm
 
 	for _, child := range children {
 		putPrm.SetObject(child)
@@ -160,7 +152,7 @@ func Test_GCDropsLockedExpiredComplexObject(t *testing.T) {
 	_, err = sh.Put(context.Background(), putPrm)
 	require.NoError(t, err)
 
-	var getPrm shard.GetPrm
+	var getPrm GetPrm
 	getPrm.SetAddress(objectCore.AddressOf(parent))
 
 	_, err = sh.Get(context.Background(), getPrm)
@@ -168,10 +160,8 @@ func Test_GCDropsLockedExpiredComplexObject(t *testing.T) {
 	require.True(t, errors.As(err, &splitInfoError), "split info must be provided")
 
 	epoch.Value = 105
-	sh.NotificationChannel() <- shard.EventNewEpoch(epoch.Value)
+	sh.gc.handleEvent(context.Background(), EventNewEpoch(epoch.Value))
 
-	require.Eventually(t, func() bool {
+	_, err = sh.Get(context.Background(), getPrm)
-		_, err = sh.Get(context.Background(), getPrm)
+	require.True(t, client.IsErrObjectNotFound(err), "expired complex object must be deleted on epoch after lock expires")
-		return client.IsErrObjectNotFound(err)
-	}, 3*time.Second, 1*time.Second, "expired complex object must be deleted on epoch after lock expires")
 }

pkg/local_object_storage/shard/get_test.go

@@ -1,4 +1,4 @@
-package shard_test
+package shard
 
 import (
 	"bytes"
@@ -9,7 +9,6 @@ import (
 
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil"
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client"
 	cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test"
 	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
@@ -33,10 +32,9 @@ func TestShard_Get(t *testing.T) {
 
 func testShardGet(t *testing.T, hasWriteCache bool) {
 	sh := newShard(t, hasWriteCache)
-	defer releaseShard(sh, t)
 
-	var putPrm shard.PutPrm
+	var putPrm PutPrm
-	var getPrm shard.GetPrm
+	var getPrm GetPrm
 
 	t.Run("small object", func(t *testing.T) {
 		obj := testutil.GenerateObject()
@@ -116,7 +114,7 @@ func testShardGet(t *testing.T, hasWriteCache bool) {
 	})
 }
 
-func testGet(t *testing.T, sh *shard.Shard, getPrm shard.GetPrm, hasWriteCache bool) (shard.GetRes, error) {
+func testGet(t *testing.T, sh *Shard, getPrm GetPrm, hasWriteCache bool) (GetRes, error) {
 	res, err := sh.Get(context.Background(), getPrm)
 	if hasWriteCache {
 		require.Eventually(t, func() bool {

pkg/local_object_storage/shard/head_test.go

@@ -1,4 +1,4 @@
-package shard_test
+package shard
 
 import (
 	"context"
@@ -8,7 +8,6 @@ import (
 
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil"
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client"
 	cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test"
 	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
@@ -31,10 +30,9 @@ func TestShard_Head(t *testing.T) {
 
 func testShardHead(t *testing.T, hasWriteCache bool) {
 	sh := newShard(t, hasWriteCache)
-	defer releaseShard(sh, t)
 
-	var putPrm shard.PutPrm
+	var putPrm PutPrm
-	var headPrm shard.HeadPrm
+	var headPrm HeadPrm
 
 	t.Run("regular object", func(t *testing.T) {
 		obj := testutil.GenerateObject()
@@ -87,7 +85,7 @@ func testShardHead(t *testing.T, hasWriteCache bool) {
 	})
 }
 
-func testHead(t *testing.T, sh *shard.Shard, headPrm shard.HeadPrm, hasWriteCache bool) (shard.HeadRes, error) {
+func testHead(t *testing.T, sh *Shard, headPrm HeadPrm, hasWriteCache bool) (HeadRes, error) {
 	res, err := sh.Head(context.Background(), headPrm)
 	if hasWriteCache {
 		require.Eventually(t, func() bool {

pkg/local_object_storage/shard/id.go

@@ -1,6 +1,8 @@
 package shard
 
 import (
+	"context"
+
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger"
 	"github.com/mr-tron/base58"
 	"go.uber.org/zap"
@@ -27,8 +29,8 @@ func (s *Shard) ID() *ID {
 }
 
 // UpdateID reads shard ID saved in the metabase and updates it if it is missing.
-func (s *Shard) UpdateID() (err error) {
+func (s *Shard) UpdateID(ctx context.Context) (err error) {
-	if err = s.metaBase.Open(false); err != nil {
+	if err = s.metaBase.Open(ctx, false); err != nil {
 		return err
 	}
 	defer func() {

pkg/local_object_storage/shard/inhume_test.go

@@ -1,4 +1,4 @@
-package shard_test
+package shard
 
 import (
 	"context"
@@ -6,7 +6,6 @@ import (
 
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil"
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client"
 	cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test"
 	"github.com/stretchr/testify/require"
@@ -28,7 +27,6 @@ func TestShard_Inhume(t *testing.T) {
 
 func testShardInhume(t *testing.T, hasWriteCache bool) {
 	sh := newShard(t, hasWriteCache)
-	defer releaseShard(sh, t)
 
 	cnr := cidtest.ID()
 
@@ -37,13 +35,13 @@ func testShardInhume(t *testing.T, hasWriteCache bool) {
 
 	ts := testutil.GenerateObjectWithCID(cnr)
 
-	var putPrm shard.PutPrm
+	var putPrm PutPrm
 	putPrm.SetObject(obj)
 
-	var inhPrm shard.InhumePrm
+	var inhPrm InhumePrm
 	inhPrm.SetTarget(object.AddressOf(ts), object.AddressOf(obj))
 
-	var getPrm shard.GetPrm
+	var getPrm GetPrm
 	getPrm.SetAddress(object.AddressOf(obj))
 
 	_, err := sh.Put(context.Background(), putPrm)

pkg/local_object_storage/shard/list_test.go

@@ -1,4 +1,4 @@
-package shard_test
+package shard
 
 import (
 	"context"
@@ -7,7 +7,6 @@ import (
 
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil"
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard"
 	cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/sync/errgroup"
@@ -19,19 +18,17 @@ func TestShard_List(t *testing.T) {
 	t.Run("without write cache", func(t *testing.T) {
 		t.Parallel()
 		sh := newShard(t, false)
-		defer releaseShard(sh, t)
 		testShardList(t, sh)
 	})
 
 	t.Run("with write cache", func(t *testing.T) {
 		t.Parallel()
 		shWC := newShard(t, true)
-		defer releaseShard(shWC, t)
 		testShardList(t, shWC)
 	})
 }
 
-func testShardList(t *testing.T, sh *shard.Shard) {
+func testShardList(t *testing.T, sh *Shard) {
 	const C = 10
 	const N = 5
 
@@ -59,7 +56,7 @@ func testShardList(t *testing.T, sh *shard.Shard) {
 					objs[object.AddressOf(obj).EncodeToString()] = 0
 					mtx.Unlock()
 
-					var putPrm shard.PutPrm
+					var putPrm PutPrm
 					putPrm.SetObject(obj)
 
 					_, err := sh.Put(context.Background(), putPrm)

pkg/local_object_storage/shard/lock_test.go

@@ -1,4 +1,4 @@
-package shard_test
+package shard
 
 import (
 	"context"
@@ -11,7 +11,6 @@ import (
 	"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"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client"
 	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
@@ -26,13 +25,13 @@ import (
 func TestShard_Lock(t *testing.T) {
 	t.Parallel()
 
-	var sh *shard.Shard
+	var sh *Shard
 
 	rootPath := t.TempDir()
-	opts := []shard.Option{
+	opts := []Option{
-		shard.WithID(shard.NewIDFromBytes([]byte{})),
+		WithID(NewIDFromBytes([]byte{})),
-		shard.WithLogger(&logger.Logger{Logger: zap.NewNop()}),
+		WithLogger(&logger.Logger{Logger: zap.NewNop()}),
-		shard.WithBlobStorOptions(
+		WithBlobStorOptions(
 			blobstor.WithStorages([]blobstor.SubStorage{
 				{
 					Storage: blobovniczatree.NewBlobovniczaTree(
@@ -49,17 +48,17 @@ func TestShard_Lock(t *testing.T) {
 				},
 			}),
 		),
-		shard.WithMetaBaseOptions(
+		WithMetaBaseOptions(
 			meta.WithPath(filepath.Join(rootPath, "meta")),
 			meta.WithEpochState(epochState{}),
 		),
-		shard.WithDeletedLockCallback(func(_ context.Context, addresses []oid.Address) {
+		WithDeletedLockCallback(func(_ context.Context, addresses []oid.Address) {
 			sh.HandleDeletedLocks(addresses)
 		}),
 	}
 
-	sh = shard.New(opts...)
+	sh = New(opts...)
-	require.NoError(t, sh.Open())
+	require.NoError(t, sh.Open(context.Background()))
 	require.NoError(t, sh.Init(context.Background()))
 
 	t.Cleanup(func() {
@@ -76,7 +75,7 @@ func TestShard_Lock(t *testing.T) {
 
 	// put the object
 
-	var putPrm shard.PutPrm
+	var putPrm PutPrm
 	putPrm.SetObject(obj)
 
 	_, err := sh.Put(context.Background(), putPrm)
@@ -94,7 +93,7 @@ func TestShard_Lock(t *testing.T) {
 	t.Run("inhuming locked objects", func(t *testing.T) {
 		ts := testutil.GenerateObjectWithCID(cnr)
 
-		var inhumePrm shard.InhumePrm
+		var inhumePrm InhumePrm
 		inhumePrm.SetTarget(objectcore.AddressOf(ts), objectcore.AddressOf(obj))
 
 		var objLockedErr *apistatus.ObjectLocked
@@ -110,7 +109,7 @@ func TestShard_Lock(t *testing.T) {
 	t.Run("inhuming lock objects", func(t *testing.T) {
 		ts := testutil.GenerateObjectWithCID(cnr)
 
-		var inhumePrm shard.InhumePrm
+		var inhumePrm InhumePrm
 		inhumePrm.SetTarget(objectcore.AddressOf(ts), objectcore.AddressOf(lock))
 
 		_, err = sh.Inhume(context.Background(), inhumePrm)
@@ -122,7 +121,7 @@ func TestShard_Lock(t *testing.T) {
 	})
 
 	t.Run("force objects inhuming", func(t *testing.T) {
-		var inhumePrm shard.InhumePrm
+		var inhumePrm InhumePrm
 		inhumePrm.MarkAsGarbage(objectcore.AddressOf(lock))
 		inhumePrm.ForceRemoval()
 
@@ -132,7 +131,7 @@ func TestShard_Lock(t *testing.T) {
 		// it should be possible to remove
 		// lock object now
 
-		inhumePrm = shard.InhumePrm{}
+		inhumePrm = InhumePrm{}
 		inhumePrm.MarkAsGarbage(objectcore.AddressOf(obj))
 
 		_, err = sh.Inhume(context.Background(), inhumePrm)
@@ -140,7 +139,7 @@ func TestShard_Lock(t *testing.T) {
 
 		// check that object has been removed
 
-		var getPrm shard.GetPrm
+		var getPrm GetPrm
 		getPrm.SetAddress(objectcore.AddressOf(obj))
 
 		_, err = sh.Get(context.Background(), getPrm)
@@ -160,7 +159,7 @@ func TestShard_IsLocked(t *testing.T) {
 
 	// put the object
 
-	var putPrm shard.PutPrm
+	var putPrm PutPrm
 	putPrm.SetObject(obj)
 
 	_, err := sh.Put(context.Background(), putPrm)

pkg/local_object_storage/shard/metrics_test.go

@@ -1,4 +1,4 @@
-package shard_test
+package shard
 
 import (
 	"context"
@@ -12,7 +12,6 @@ import (
 	"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/pilorama"
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode"
 	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
 	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
@@ -126,9 +125,6 @@ func (m *metricsStore) DeleteShardMetrics() {
 	m.errCounter = 0
 }
 
-const physical = "phy"
-const logical = "logic"
-
 func TestCounters(t *testing.T) {
 	t.Parallel()
 
@@ -163,24 +159,22 @@ func TestCounters(t *testing.T) {
 		totalPayload += oSize
 	}
 
-	t.Run("put", func(t *testing.T) {
+	var prm PutPrm
-		var prm shard.PutPrm
 
-		for i := 0; i < objNumber; i++ {
+	for i := 0; i < objNumber; i++ {
-			prm.SetObject(oo[i])
+		prm.SetObject(oo[i])
 
-			_, err := sh.Put(context.Background(), prm)
+		_, err := sh.Put(context.Background(), prm)
-			require.NoError(t, err)
+		require.NoError(t, err)
-		}
+	}
 
-		require.Equal(t, uint64(objNumber), mm.getObjectCounter(physical))
+	require.Equal(t, uint64(objNumber), mm.getObjectCounter(physical))
-		require.Equal(t, uint64(objNumber), mm.getObjectCounter(logical))
+	require.Equal(t, uint64(objNumber), mm.getObjectCounter(logical))
-		require.Equal(t, expectedSizes, mm.containerSizes())
+	require.Equal(t, expectedSizes, mm.containerSizes())
-		require.Equal(t, totalPayload, mm.payloadSize())
+	require.Equal(t, totalPayload, mm.payloadSize())
-	})
 
 	t.Run("inhume_GC", func(t *testing.T) {
-		var prm shard.InhumePrm
+		var prm InhumePrm
 		inhumedNumber := objNumber / 4
 
 		for i := 0; i < inhumedNumber; i++ {
@@ -199,7 +193,7 @@ func TestCounters(t *testing.T) {
 	})
 
 	t.Run("inhume_TS", func(t *testing.T) {
-		var prm shard.InhumePrm
+		var prm InhumePrm
 		ts := objectcore.AddressOf(testutil.GenerateObject())
 
 		phy := mm.getObjectCounter(physical)
@@ -220,7 +214,7 @@ func TestCounters(t *testing.T) {
 	})
 
 	t.Run("Delete", func(t *testing.T) {
-		var prm shard.DeletePrm
+		var prm DeletePrm
 
 		phy := mm.getObjectCounter(physical)
 		logic := mm.getObjectCounter(logical)
@@ -246,7 +240,7 @@ func TestCounters(t *testing.T) {
 	})
 }
 
-func shardWithMetrics(t *testing.T, path string) (*shard.Shard, *metricsStore) {
+func shardWithMetrics(t *testing.T, path string) (*Shard, *metricsStore) {
 	blobOpts := []blobstor.Option{
 		blobstor.WithStorages([]blobstor.SubStorage{
 			{
@@ -266,16 +260,16 @@ func shardWithMetrics(t *testing.T, path string) (*shard.Shard, *metricsStore) {
 		cnrSize: make(map[string]int64),
 	}
 
-	sh := shard.New(
+	sh := New(
-		shard.WithID(shard.NewIDFromBytes([]byte{})),
+		WithID(NewIDFromBytes([]byte{})),
-		shard.WithBlobStorOptions(blobOpts...),
+		WithBlobStorOptions(blobOpts...),
-		shard.WithPiloramaOptions(pilorama.WithPath(filepath.Join(path, "pilorama"))),
+		WithPiloramaOptions(pilorama.WithPath(filepath.Join(path, "pilorama"))),
-		shard.WithMetaBaseOptions(
+		WithMetaBaseOptions(
 			meta.WithPath(filepath.Join(path, "meta")),
 			meta.WithEpochState(epochState{})),
-		shard.WithMetricsWriter(mm),
+		WithMetricsWriter(mm),
 	)
-	require.NoError(t, sh.Open())
+	require.NoError(t, sh.Open(context.Background()))
 	require.NoError(t, sh.Init(context.Background()))
 
 	t.Cleanup(func() {

pkg/local_object_storage/shard/range_test.go

@@ -1,4 +1,4 @@
-package shard_test
+package shard
 
 import (
 	"context"
@@ -11,7 +11,6 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil"
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard"
 	writecacheconfig "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache/config"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache/writecachebbolt"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger/test"
@@ -77,25 +76,27 @@ func testShardGetRange(t *testing.T, hasWriteCache bool) {
 		},
 	}
 
-	sh := newCustomShard(t, t.TempDir(), hasWriteCache, wcOpts,
+	sh := newCustomShard(t, hasWriteCache, shardOptions{
-		[]blobstor.Option{blobstor.WithStorages([]blobstor.SubStorage{
+		wcOpts: wcOpts,
-			{
+		bsOpts: []blobstor.Option{
-				Storage: blobovniczatree.NewBlobovniczaTree(
+			blobstor.WithStorages([]blobstor.SubStorage{
-					blobovniczatree.WithLogger(test.NewLogger(t, true)),
+				{
-					blobovniczatree.WithRootPath(filepath.Join(t.TempDir(), "blob", "blobovnicza")),
+					Storage: blobovniczatree.NewBlobovniczaTree(
-					blobovniczatree.WithBlobovniczaShallowDepth(1),
+						blobovniczatree.WithLogger(test.NewLogger(t, true)),
-					blobovniczatree.WithBlobovniczaShallowWidth(1)),
+						blobovniczatree.WithRootPath(filepath.Join(t.TempDir(), "blob", "blobovnicza")),
-				Policy: func(_ *objectSDK.Object, data []byte) bool {
+						blobovniczatree.WithBlobovniczaShallowDepth(1),
-					return len(data) <= smallObjectSize
+						blobovniczatree.WithBlobovniczaShallowWidth(1)),
+					Policy: func(_ *objectSDK.Object, data []byte) bool {
+						return len(data) <= smallObjectSize
+					},
 				},
-			},
+				{
-			{
+					Storage: fstree.New(
-				Storage: fstree.New(
+						fstree.WithPath(filepath.Join(t.TempDir(), "blob"))),
-					fstree.WithPath(filepath.Join(t.TempDir(), "blob"))),
+				},
-			},
+			}),
-		})},
+		},
-		nil)
+	})
-	defer releaseShard(sh, t)
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
@@ -106,13 +107,13 @@ func testShardGetRange(t *testing.T, hasWriteCache bool) {
 			addr := object.AddressOf(obj)
 			payload := slice.Copy(obj.Payload())
 
-			var putPrm shard.PutPrm
+			var putPrm PutPrm
 			putPrm.SetObject(obj)
 
 			_, err := sh.Put(context.Background(), putPrm)
 			require.NoError(t, err)
 
-			var rngPrm shard.RngPrm
+			var rngPrm RngPrm
 			rngPrm.SetAddress(addr)
 			rngPrm.SetRange(tc.rng.GetOffset(), tc.rng.GetLength())
 

pkg/local_object_storage/shard/reload_test.go

@@ -52,7 +52,7 @@ func TestShardReload(t *testing.T) {
 			pilorama.WithPath(filepath.Join(p, "pilorama")))}
 
 	sh := New(opts...)
-	require.NoError(t, sh.Open())
+	require.NoError(t, sh.Open(context.Background()))
 	require.NoError(t, sh.Init(context.Background()))
 
 	objects := make([]objAddr, 5)

pkg/local_object_storage/shard/shard_test.go

@@ -1,4 +1,4 @@
-package shard_test
+package shard
 
 import (
 	"context"
@@ -11,7 +11,6 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree"
 	meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama"
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard"
 	writecacheconfig "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache/config"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache/writecachebadger"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache/writecachebbolt"
@@ -31,39 +30,50 @@ func (s epochState) CurrentEpoch() uint64 {
 	return s.Value
 }
 
-func newShard(t testing.TB, enableWriteCache bool) *shard.Shard {
+type shardOptions struct {
-	return newCustomShard(t, t.TempDir(), enableWriteCache,
+	rootPath    string
-		writecacheconfig.Options{Type: writecacheconfig.TypeBBolt},
+	dontRelease bool
-		nil,
+	wcOpts      writecacheconfig.Options
-		nil)
+	bsOpts      []blobstor.Option
+	metaOptions []meta.Option
+
+	additionalShardOptions []Option
 }
 
-func newCustomShard(t testing.TB, rootPath string, enableWriteCache bool, wcOpts writecacheconfig.Options, bsOpts []blobstor.Option, metaOptions []meta.Option) *shard.Shard {
+func newShard(t testing.TB, enableWriteCache bool) *Shard {
-	var sh *shard.Shard
+	return newCustomShard(t, enableWriteCache, shardOptions{})
-	if enableWriteCache {
+}
-		rootPath = filepath.Join(rootPath, "wc")
+
-		switch wcOpts.Type {
+func newCustomShard(t testing.TB, enableWriteCache bool, o shardOptions) *Shard {
-		case writecacheconfig.TypeBBolt:
+	if o.rootPath == "" {
-			wcOpts.BBoltOptions = append(
+		o.rootPath = t.TempDir()
-				[]writecachebbolt.Option{writecachebbolt.WithPath(filepath.Join(rootPath, "wcache"))},
+	}
-				wcOpts.BBoltOptions...)
+	if enableWriteCache && o.wcOpts.Type == 0 {
-		case writecacheconfig.TypeBadger:
+		o.wcOpts.Type = writecacheconfig.TypeBBolt
-			wcOpts.BadgerOptions = append(
-				[]writecachebadger.Option{writecachebadger.WithPath(filepath.Join(rootPath, "wcache"))},
-				wcOpts.BadgerOptions...)
-		}
-	} else {
-		rootPath = filepath.Join(rootPath, "nowc")
 	}
 
-	if bsOpts == nil {
+	var sh *Shard
-		bsOpts = []blobstor.Option{
+	if enableWriteCache {
+		switch o.wcOpts.Type {
+		case writecacheconfig.TypeBBolt:
+			o.wcOpts.BBoltOptions = append(
+				[]writecachebbolt.Option{writecachebbolt.WithPath(filepath.Join(o.rootPath, "wcache"))},
+				o.wcOpts.BBoltOptions...)
+		case writecacheconfig.TypeBadger:
+			o.wcOpts.BadgerOptions = append(
+				[]writecachebadger.Option{writecachebadger.WithPath(filepath.Join(o.rootPath, "wcache"))},
+				o.wcOpts.BadgerOptions...)
+		}
+	}
+
+	if o.bsOpts == nil {
+		o.bsOpts = []blobstor.Option{
 			blobstor.WithLogger(test.NewLogger(t, true)),
 			blobstor.WithStorages([]blobstor.SubStorage{
 				{
 					Storage: blobovniczatree.NewBlobovniczaTree(
 						blobovniczatree.WithLogger(test.NewLogger(t, true)),
-						blobovniczatree.WithRootPath(filepath.Join(rootPath, "blob", "blobovnicza")),
+						blobovniczatree.WithRootPath(filepath.Join(o.rootPath, "blob", "blobovnicza")),
 						blobovniczatree.WithBlobovniczaShallowDepth(1),
 						blobovniczatree.WithBlobovniczaShallowWidth(1)),
 					Policy: func(_ *objectSDK.Object, data []byte) bool {
@@ -72,46 +82,51 @@ func newCustomShard(t testing.TB, rootPath string, enableWriteCache bool, wcOpts
 				},
 				{
 					Storage: fstree.New(
-						fstree.WithPath(filepath.Join(rootPath, "blob"))),
+						fstree.WithPath(filepath.Join(o.rootPath, "blob"))),
 				},
 			}),
 		}
 	}
 
-	opts := []shard.Option{
+	opts := []Option{
-		shard.WithID(shard.NewIDFromBytes([]byte{})),
+		WithID(NewIDFromBytes([]byte{})),
-		shard.WithLogger(test.NewLogger(t, true)),
+		WithLogger(test.NewLogger(t, true)),
-		shard.WithBlobStorOptions(bsOpts...),
+		WithBlobStorOptions(o.bsOpts...),
-		shard.WithMetaBaseOptions(
+		WithMetaBaseOptions(
 			append([]meta.Option{
-				meta.WithPath(filepath.Join(rootPath, "meta")), meta.WithEpochState(epochState{})},
+				meta.WithPath(filepath.Join(o.rootPath, "meta")), meta.WithEpochState(epochState{})},
-				metaOptions...)...,
+				o.metaOptions...)...,
 		),
-		shard.WithPiloramaOptions(pilorama.WithPath(filepath.Join(rootPath, "pilorama"))),
+		WithPiloramaOptions(pilorama.WithPath(filepath.Join(o.rootPath, "pilorama"))),
-		shard.WithWriteCache(enableWriteCache),
+		WithWriteCache(enableWriteCache),
-		shard.WithWriteCacheOptions(wcOpts),
+		WithWriteCacheOptions(o.wcOpts),
-		shard.WithDeletedLockCallback(func(_ context.Context, addresses []oid.Address) {
+		WithDeletedLockCallback(func(_ context.Context, addresses []oid.Address) {
 			sh.HandleDeletedLocks(addresses)
 		}),
-		shard.WithExpiredLocksCallback(func(ctx context.Context, epoch uint64, a []oid.Address) {
+		WithExpiredLocksCallback(func(ctx context.Context, epoch uint64, a []oid.Address) {
 			sh.HandleExpiredLocks(ctx, epoch, a)
 		}),
-		shard.WithGCWorkerPoolInitializer(func(sz int) util.WorkerPool {
+		WithGCWorkerPoolInitializer(func(sz int) util.WorkerPool {
 			pool, err := ants.NewPool(sz)
 			require.NoError(t, err)
 			return pool
 		}),
-		shard.WithGCRemoverSleepInterval(100 * time.Millisecond),
+		WithGCRemoverSleepInterval(100 * time.Millisecond),
 	}
+	opts = append(opts, o.additionalShardOptions...)
 
-	sh = shard.New(opts...)
+	sh = New(opts...)
 
-	require.NoError(t, sh.Open())
+	require.NoError(t, sh.Open(context.Background()))
 	require.NoError(t, sh.Init(context.Background()))
 
+	if !o.dontRelease {
+		t.Cleanup(func() { releaseShard(sh, t) })
+	}
+
 	return sh
 }
 
-func releaseShard(s *shard.Shard, t testing.TB) {
+func releaseShard(s *Shard, t testing.TB) {
 	require.NoError(t, s.Close())
 }

pkg/local_object_storage/shard/shutdown_test.go

@@ -1,4 +1,4 @@
-package shard_test
+package shard
 
 import (
 	"context"
@@ -7,7 +7,6 @@ import (
 
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil"
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard"
 	writecacheconfig "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache/config"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache/writecachebbolt"
 	cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test"
@@ -44,13 +43,13 @@ func TestWriteCacheObjectLoss(t *testing.T) {
 		},
 	}
 
-	sh := newCustomShard(t, dir, true, wcOpts, nil, nil)
+	sh := newCustomShard(t, true, shardOptions{dontRelease: true, rootPath: dir, wcOpts: wcOpts})
 
 	var errG errgroup.Group
 	for i := range objects {
 		obj := objects[i]
 		errG.Go(func() error {
-			var putPrm shard.PutPrm
+			var putPrm PutPrm
 			putPrm.SetObject(obj)
 			_, err := sh.Put(context.Background(), putPrm)
 			return err
@@ -59,10 +58,9 @@ func TestWriteCacheObjectLoss(t *testing.T) {
 	require.NoError(t, errG.Wait())
 	require.NoError(t, sh.Close())
 
-	sh = newCustomShard(t, dir, true, wcOpts, nil, nil)
+	sh = newCustomShard(t, true, shardOptions{rootPath: dir, wcOpts: wcOpts})
-	defer releaseShard(sh, t)
 
-	var getPrm shard.GetPrm
+	var getPrm GetPrm
 
 	for i := range objects {
 		getPrm.SetAddress(object.AddressOf(objects[i]))

pkg/local_object_storage/writecache/benchmark/writecache_test.go

@@ -82,7 +82,7 @@ func benchmarkPutPar(b *testing.B, cache writecache.Cache, size uint64) {
 }
 
 func benchmarkPutPrepare(b *testing.B, cache writecache.Cache) {
-	require.NoError(b, cache.Open(false), "opening")
+	require.NoError(b, cache.Open(context.Background(), false), "opening")
 	require.NoError(b, cache.Init(), "initializing")
 	b.Cleanup(func() {
 		require.NoError(b, cache.Close(), "closing")

pkg/local_object_storage/writecache/writecache.go

@@ -38,7 +38,7 @@ type Cache interface {
 	Flush(context.Context, bool) error
 
 	Init() error
-	Open(readOnly bool) error
+	Open(ctx context.Context, readOnly bool) error
 	Close() error
 }
 

pkg/local_object_storage/writecache/writecachebadger/cachebadger.go

@@ -1,6 +1,7 @@
 package writecachebadger
 
 import (
+	"context"
 	"sync"
 
 	"git.frostfs.info/TrueCloudLab/frostfs-node/internal/logs"
@@ -83,7 +84,7 @@ func (c *cache) DumpInfo() writecache.Info {
 }
 
 // Open opens and initializes database. Reads object counters from the ObjectCounters instance.
-func (c *cache) Open(readOnly bool) error {
+func (c *cache) Open(_ context.Context, readOnly bool) error {
 	err := c.openStore(readOnly)
 	if err != nil {
 		return metaerr.Wrap(err)

pkg/local_object_storage/writecache/writecachebadger/flush_test.go

@@ -14,9 +14,12 @@ import (
 	oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test"
 	"github.com/dgraph-io/badger/v4"
 	"github.com/stretchr/testify/require"
+	"go.uber.org/zap"
 )
 
 func TestFlush(t *testing.T) {
+	testlogger := test.NewLogger(t, true)
+
 	createCacheFn := func(t *testing.T, smallSize uint64, mb *meta.DB, bs writecache.MainStorage, opts ...Option) writecache.Cache {
 		return New(
 			append([]Option{
@@ -30,8 +33,9 @@ func TestFlush(t *testing.T) {
 
 	errCountOpt := func() (Option, *atomic.Uint32) {
 		cnt := &atomic.Uint32{}
-		return WithReportErrorFunc(func(string, error) {
+		return WithReportErrorFunc(func(msg string, err error) {
 			cnt.Add(1)
+			testlogger.Warn(msg, zap.Uint32("error_count", cnt.Load()), zap.Error(err))
 		}), cnt
 	}
 

pkg/local_object_storage/writecache/writecachebbolt/cachebbolt.go

@@ -1,6 +1,7 @@
 package writecachebbolt
 
 import (
+	"context"
 	"os"
 	"sync"
 
@@ -97,7 +98,7 @@ func (c *cache) DumpInfo() writecache.Info {
 }
 
 // Open opens and initializes database. Reads object counters from the ObjectCounters instance.
-func (c *cache) Open(readOnly bool) error {
+func (c *cache) Open(_ context.Context, readOnly bool) error {
 	err := c.openStore(readOnly)
 	if err != nil {
 		return metaerr.Wrap(err)

pkg/local_object_storage/writecache/writecachebbolt/flush_test.go

@@ -17,13 +17,16 @@ import (
 	oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test"
 	"github.com/stretchr/testify/require"
 	"go.etcd.io/bbolt"
+	"go.uber.org/zap"
 )
 
 func TestFlush(t *testing.T) {
+	testlogger := test.NewLogger(t, true)
+
 	createCacheFn := func(t *testing.T, smallSize uint64, mb *meta.DB, bs writecache.MainStorage, opts ...Option) writecache.Cache {
 		return New(
 			append([]Option{
-				WithLogger(test.NewLogger(t, true)),
+				WithLogger(testlogger),
 				WithPath(filepath.Join(t.TempDir(), "writecache")),
 				WithSmallObjectSize(smallSize),
 				WithMetabase(mb),
@@ -33,8 +36,9 @@ func TestFlush(t *testing.T) {
 
 	errCountOpt := func() (Option, *atomic.Uint32) {
 		cnt := &atomic.Uint32{}
-		return WithReportErrorFunc(func(string, error) {
+		return WithReportErrorFunc(func(msg string, err error) {
 			cnt.Add(1)
+			testlogger.Warn(msg, zap.Uint32("error_count", cnt.Load()), zap.Error(err))
 		}), cnt
 	}
 

pkg/local_object_storage/writecache/writecachetest/flush.go

@@ -110,7 +110,7 @@ func newCache[Option any](
 	mb := meta.New(
 		meta.WithPath(filepath.Join(dir, "meta")),
 		meta.WithEpochState(dummyEpoch{}))
-	require.NoError(t, mb.Open(false))
+	require.NoError(t, mb.Open(context.Background(), false))
 	require.NoError(t, mb.Init())
 
 	bs := blobstor.New(blobstor.WithStorages([]blobstor.SubStorage{
@@ -121,12 +121,12 @@ func newCache[Option any](
 				fstree.WithDirNameLen(1)),
 		},
 	}))
-	require.NoError(t, bs.Open(false))
+	require.NoError(t, bs.Open(context.Background(), 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.Open(context.Background(), false))
 	require.NoError(t, wc.Init())
 
 	// First set mode for metabase and blobstor to prevent background flushes.

pkg/network/cache/multi.go

@@ -130,6 +130,7 @@ loop:
 				continue loop
 			}
 		}
+		x.clients[a].invalidate()
 		delete(x.clients, a)
 	}
 

pkg/services/object/acl/eacl/v2/headers.go

@@ -137,6 +137,8 @@ func (h *cfg) readObjectHeadersFromRequestXHeaderSource(m requestXHeaderSource,
 
 			dst.objectHeaders = headersFromObject(objectSDK.NewFromV2(oV2), h.cnr, h.obj)
 		}
+	case *objectV2.PutSingleRequest:
+		dst.objectHeaders = headersFromObject(objectSDK.NewFromV2(req.GetBody().GetObject()), h.cnr, h.obj)
 	case *objectV2.SearchRequest:
 		cnrV2 := req.GetBody().GetContainerID()
 		var cnr cid.ID

pkg/services/policer/check.go

@@ -3,6 +3,7 @@ package policer
 import (
 	"context"
 	"errors"
+	"fmt"
 
 	"git.frostfs.info/TrueCloudLab/frostfs-node/internal/logs"
 	containercore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container"
@@ -16,48 +17,33 @@ import (
 	"go.uber.org/zap"
 )
 
-func (p *Policer) processObject(ctx context.Context, addrWithType objectcore.AddressWithType) {
+func (p *Policer) processObject(ctx context.Context, addrWithType objectcore.AddressWithType) error {
 	addr := addrWithType.Address
 	idCnr := addr.Container()
 	idObj := addr.Object()
 
 	cnr, err := p.cnrSrc.Get(idCnr)
 	if err != nil {
-		p.log.Error(logs.PolicerCouldNotGetContainer,
-			zap.Stringer("cid", idCnr),
-			zap.String("error", err.Error()),
-		)
 		if client.IsErrContainerNotFound(err) {
-			existed, err := containercore.WasRemoved(p.cnrSrc, idCnr)
+			existed, errWasRemoved := containercore.WasRemoved(p.cnrSrc, idCnr)
-			if err != nil {
+			if errWasRemoved != nil {
-				p.log.Error(logs.PolicerCouldNotConfirmContainerRemoval,
+				return fmt.Errorf("%s: %w", logs.PolicerCouldNotConfirmContainerRemoval, errWasRemoved)
-					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,
+					return fmt.Errorf("%s: %w", logs.PolicerCouldNotInhumeObjectWithMissingContainer, err)
-						zap.Stringer("cid", idCnr),
-						zap.Stringer("oid", idObj),
-						zap.String("error", err.Error()))
 				}
 			}
 		}
 
-		return
+		return fmt.Errorf("%s: %w", logs.PolicerCouldNotGetContainer, err)
 	}
 
 	policy := cnr.Value.PlacementPolicy()
 
 	nn, err := p.placementBuilder.BuildPlacement(idCnr, &idObj, policy)
 	if err != nil {
-		p.log.Error(logs.PolicerCouldNotBuildPlacementVectorForObject,
+		return fmt.Errorf("%s: %w", logs.PolicerCouldNotBuildPlacementVectorForObject, err)
-			zap.Stringer("cid", idCnr),
-			zap.String("error", err.Error()),
-		)
-
-		return
 	}
 
 	c := &placementRequirements{}
@@ -73,7 +59,7 @@ func (p *Policer) processObject(ctx context.Context, addrWithType objectcore.Add
 	for i := range nn {
 		select {
 		case <-ctx.Done():
-			return
+			return ctx.Err()
 		default:
 		}
 
@@ -87,6 +73,7 @@ func (p *Policer) processObject(ctx context.Context, addrWithType objectcore.Add
 
 		p.cbRedundantCopy(ctx, addr)
 	}
+	return nil
 }
 
 type placementRequirements struct {

pkg/services/policer/policer_test.go

@@ -12,6 +12,7 @@ import (
 	objectcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/replicator"
+	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client"
 	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap"
@@ -245,7 +246,8 @@ func TestProcessObject(t *testing.T) {
 				Type:    ti.objType,
 			}
 
-			p.processObject(context.Background(), addrWithType)
+			err := p.processObject(context.Background(), addrWithType)
+			require.NoError(t, err)
 			sort.Ints(gotReplicateTo)
 
 			require.Equal(t, ti.wantRemoveRedundant, gotRemoveRedundant)
@@ -254,6 +256,35 @@ func TestProcessObject(t *testing.T) {
 	}
 }
 
+func TestProcessObjectError(t *testing.T) {
+	addr := oidtest.Address()
+	// Container source
+	cnr := &container.Container{}
+	cnr.Value.Init()
+	source := containerSrc{
+		get: func(id cid.ID) (*container.Container, error) {
+			return nil, new(apistatus.ContainerNotFound)
+		},
+		deletionInfo: func(id cid.ID) (*container.DelInfo, error) {
+			return nil, new(apistatus.ContainerNotFound)
+		},
+	}
+	buryFn := func(ctx context.Context, a oid.Address) error {
+		t.Errorf("unexpected object buried: %v", a)
+		return nil
+	}
+	p := New(
+		WithContainerSource(source),
+		WithBuryFunc(buryFn),
+	)
+
+	addrWithType := objectcore.AddressWithType{
+		Address: addr,
+	}
+
+	require.True(t, client.IsErrContainerNotFound(p.processObject(context.Background(), addrWithType)))
+}
+
 func TestIteratorContract(t *testing.T) {
 	addr := oidtest.Address()
 	objs := []objectcore.AddressWithType{{

pkg/services/policer/process.go

@@ -52,7 +52,12 @@ func (p *Policer) shardPolicyWorker(ctx context.Context) {
 					}
 
 					if p.objsInWork.add(addr.Address) {
-						p.processObject(ctx, addr)
+						err := p.processObject(ctx, addr)
+						if err != nil {
+							p.log.Error(logs.PolicerUnableToProcessObj,
+								zap.Stringer("object", addr.Address),
+								zap.String("error", err.Error()))
+						}
 						p.cache.Add(addr.Address, time.Now())
 						p.objsInWork.remove(addr.Address)
 					}