From cd2228cd991a4171028f00180210e71d7a30c8e4 Mon Sep 17 00:00:00 2001
From: Leonard Lyubich <leonard@nspcc.ru>
Date: Mon, 30 Nov 2020 18:35:37 +0300
Subject: [PATCH] [#220] cmd/neofs-node: Support new configuration of storage
 components

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
---
 cmd/neofs-node/config.go | 38 ++++++++++++++++++++++++++++++++------
 cmd/neofs-node/main.go   |  3 +++
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/cmd/neofs-node/config.go b/cmd/neofs-node/config.go
index a61656f90..1ee51a652 100644
--- a/cmd/neofs-node/config.go
+++ b/cmd/neofs-node/config.go
@@ -22,7 +22,7 @@ import (
 	"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/bucket"
 	"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/bucket/fsbucket"
 	"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/engine"
-	meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase"
+	meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase/v2"
 	"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard"
 	"github.com/nspcc-dev/neofs-node/pkg/morph/client"
 	"github.com/nspcc-dev/neofs-node/pkg/morph/client/container/wrapper"
@@ -36,7 +36,6 @@ import (
 	"github.com/panjf2000/ants/v2"
 	"github.com/pkg/errors"
 	"github.com/spf13/viper"
-	"go.etcd.io/bbolt"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 )
@@ -122,6 +121,12 @@ const (
 	cfgBlobStorTreePerm     = "perm"
 	cfgBlobStorSmallSzLimit = "small_size_limit"
 
+	cfgBlobStorBlzSection = "blobovnicza"
+	cfgBlzSize            = "size"
+	cfgBlzShallowDepth    = "shallow_depth"
+	cfgBlzShallowWidth    = "shallow_width"
+	cfgBlzOpenedCacheSize = "opened_cache_size"
+
 	cfgMetaBaseSection = "metabase"
 	cfgMetaBasePath    = "path"
 	cfgMetaBasePerm    = "perm"
@@ -456,6 +461,24 @@ func initShardOptions(c *cfg) {
 			configPath(blobPrefix, cfgBlobStorSmallSzLimit),
 		)
 
+		blzPrefix := configPath(blobPrefix, cfgBlobStorBlzSection)
+
+		blzSize := c.viper.GetUint64(
+			configPath(blzPrefix, cfgBlzSize),
+		)
+
+		blzShallowDepth := c.viper.GetUint64(
+			configPath(blzPrefix, cfgBlzShallowDepth),
+		)
+
+		blzShallowWidth := c.viper.GetUint64(
+			configPath(blzPrefix, cfgBlzShallowWidth),
+		)
+
+		blzCacheSize := c.viper.GetInt(
+			configPath(blzPrefix, cfgBlzOpenedCacheSize),
+		)
+
 		metaPrefix := configPath(prefix, cfgMetaBaseSection)
 
 		metaPath := c.viper.GetString(
@@ -468,9 +491,6 @@ func initShardOptions(c *cfg) {
 
 		fatalOnErr(os.MkdirAll(path.Dir(metaPath), metaPerm))
 
-		boltDB, err := bbolt.Open(metaPath, metaPerm, nil)
-		fatalOnErr(err)
-
 		opts = append(opts, []shard.Option{
 			shard.WithLogger(c.log),
 			shard.WithBlobStorOptions(
@@ -479,10 +499,16 @@ func initShardOptions(c *cfg) {
 				blobstor.WithTreeRootPerm(blobPerm),
 				blobstor.WithShallowDepth(shallowDepth),
 				blobstor.WithSmallSizeLimit(smallSzLimit),
+				blobstor.WithBlobovniczaSize(blzSize),
+				blobstor.WithBlobovniczaShallowDepth(blzShallowDepth),
+				blobstor.WithBlobovniczaShallowWidth(blzShallowWidth),
+				blobstor.WithBlobovniczaOpenedCacheSize(blzCacheSize),
+				blobstor.WithLogger(c.log),
 			),
 			shard.WithMetaBaseOptions(
 				meta.WithLogger(c.log),
-				meta.FromBoltDB(boltDB),
+				meta.WithPath(metaPath),
+				meta.WithPermissions(metaPerm),
 			),
 		})
 
diff --git a/cmd/neofs-node/main.go b/cmd/neofs-node/main.go
index bf9f27093..430a58c9f 100644
--- a/cmd/neofs-node/main.go
+++ b/cmd/neofs-node/main.go
@@ -40,6 +40,9 @@ func init_(c *cfg) {
 	initObjectService(c)
 	initProfiler(c)
 
+	fatalOnErr(c.cfgObject.cfgLocalStorage.localStorage.Open())
+	fatalOnErr(c.cfgObject.cfgLocalStorage.localStorage.Init())
+
 	listenMorphNotifications(c)
 }