From 4f6cc0fcf877875a016535c51d9375b40ce67396 Mon Sep 17 00:00:00 2001
From: Dmitrii Stepanov <d.stepanov@yadro.com>
Date: Tue, 2 Jul 2024 16:34:23 +0300
Subject: [PATCH] [#9999] engine: Fix methods after db engine change

Signed-off-by: Dmitrii Stepanov <d.stepanov@yadro.com>
---
 pkg/local_object_storage/engine/container.go    | 12 ++++++------
 pkg/local_object_storage/engine/control_test.go |  6 ------
 pkg/local_object_storage/engine/inhume.go       |  2 +-
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/pkg/local_object_storage/engine/container.go b/pkg/local_object_storage/engine/container.go
index e45f502ac..716d526fa 100644
--- a/pkg/local_object_storage/engine/container.go
+++ b/pkg/local_object_storage/engine/container.go
@@ -44,9 +44,9 @@ func (r ListContainersRes) Containers() []cid.ID {
 // ContainerSize returns the sum of estimation container sizes among all shards.
 //
 // Returns an error if executions are blocked (see BlockExecution).
-func (e *StorageEngine) ContainerSize(prm ContainerSizePrm) (res ContainerSizeRes, err error) {
+func (e *StorageEngine) ContainerSize(ctx context.Context, prm ContainerSizePrm) (res ContainerSizeRes, err error) {
 	err = e.execIfNotBlocked(func() error {
-		res, err = e.containerSize(prm)
+		res, err = e.containerSize(ctx, prm)
 		return err
 	})
 
@@ -54,12 +54,12 @@ func (e *StorageEngine) ContainerSize(prm ContainerSizePrm) (res ContainerSizeRe
 }
 
 // ContainerSize calls ContainerSize method on engine to calculate sum of estimation container sizes among all shards.
-func ContainerSize(e *StorageEngine, id cid.ID) (uint64, error) {
+func ContainerSize(ctx context.Context, e *StorageEngine, id cid.ID) (uint64, error) {
 	var prm ContainerSizePrm
 
 	prm.SetContainerID(id)
 
-	res, err := e.ContainerSize(prm)
+	res, err := e.ContainerSize(ctx, prm)
 	if err != nil {
 		return 0, err
 	}
@@ -67,7 +67,7 @@ func ContainerSize(e *StorageEngine, id cid.ID) (uint64, error) {
 	return res.Size(), nil
 }
 
-func (e *StorageEngine) containerSize(prm ContainerSizePrm) (res ContainerSizeRes, err error) {
+func (e *StorageEngine) containerSize(ctx context.Context, prm ContainerSizePrm) (res ContainerSizeRes, err error) {
 	if e.metrics != nil {
 		defer elapsed("EstimateContainerSize", e.metrics.AddMethodDuration)()
 	}
@@ -76,7 +76,7 @@ func (e *StorageEngine) containerSize(prm ContainerSizePrm) (res ContainerSizeRe
 		var csPrm shard.ContainerSizePrm
 		csPrm.SetContainerID(prm.cnr)
 
-		csRes, err := sh.Shard.ContainerSize(csPrm)
+		csRes, err := sh.Shard.ContainerSize(ctx, csPrm)
 		if err != nil {
 			e.reportShardError(sh, "can't get container size", err,
 				zap.Stringer("container_id", prm.cnr))
diff --git a/pkg/local_object_storage/engine/control_test.go b/pkg/local_object_storage/engine/control_test.go
index ea2092c16..32656ccfd 100644
--- a/pkg/local_object_storage/engine/control_test.go
+++ b/pkg/local_object_storage/engine/control_test.go
@@ -10,7 +10,6 @@ import (
 	"strconv"
 	"sync/atomic"
 	"testing"
-	"time"
 
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor"
@@ -24,7 +23,6 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger/test"
 	cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test"
 	"github.com/stretchr/testify/require"
-	"go.etcd.io/bbolt"
 )
 
 // TestInitializationFailure checks that shard is initialized and closed even if media
@@ -53,10 +51,6 @@ func TestInitializationFailure(t *testing.T) {
 			shard.WithBlobStorOptions(
 				blobstor.WithStorages(storages)),
 			shard.WithMetaBaseOptions(
-				meta.WithBoltDBOptions(&bbolt.Options{
-					Timeout:  100 * time.Millisecond,
-					OpenFile: opts.openFileMetabase,
-				}),
 				meta.WithPath(filepath.Join(t.TempDir(), "metabase")),
 				meta.WithPermissions(0o700),
 				meta.WithEpochState(epochState{})),
diff --git a/pkg/local_object_storage/engine/inhume.go b/pkg/local_object_storage/engine/inhume.go
index 991305af0..49b793312 100644
--- a/pkg/local_object_storage/engine/inhume.go
+++ b/pkg/local_object_storage/engine/inhume.go
@@ -317,7 +317,7 @@ func (e *StorageEngine) processZeroSizeContainers(ctx context.Context, ids []cid
 		var drop []cid.ID
 		for id := range idMap {
 			prm.SetContainerID(id)
-			s, err := sh.ContainerSize(prm)
+			s, err := sh.ContainerSize(ctx, prm)
 			if err != nil {
 				e.log.Warn(logs.EngineFailedToGetContainerSize, zap.Stringer("container_id", id), zap.Error(err))
 				failed = true