cmd/frostfs-node/config.go

@@ -188,10 +188,8 @@ type subStorageCfg struct {
 	// blobovnicza-specific
 	size                   uint64
 	width                  uint64
-	leafWidth              uint64
 	openedCacheSize        int
 	initWorkerCount        int
-	initInAdvance          bool
 	rebuildDropTimeout     time.Duration
 	openedCacheTTL         time.Duration
 	openedCacheExpInterval time.Duration
@@ -314,12 +312,10 @@ func (a *applicationConfiguration) setShardStorageConfig(newConfig *shardCfg, ol
 			sCfg.size = sub.Size()
 			sCfg.depth = sub.ShallowDepth()
 			sCfg.width = sub.ShallowWidth()
-			sCfg.leafWidth = sub.LeafWidth()
 			sCfg.openedCacheSize = sub.OpenedCacheSize()
 			sCfg.openedCacheTTL = sub.OpenedCacheTTL()
 			sCfg.openedCacheExpInterval = sub.OpenedCacheExpInterval()
 			sCfg.initWorkerCount = sub.InitWorkerCount()
-			sCfg.initInAdvance = sub.InitInAdvance()
 			sCfg.rebuildDropTimeout = sub.RebuildDropTimeout()
 		case fstree.Type:
 			sub := fstreeconfig.From((*config.Config)(storagesCfg[i]))
@@ -906,12 +902,10 @@ func (c *cfg) getSubstorageOpts(ctx context.Context, shCfg shardCfg) []blobstor.
 				blobovniczatree.WithBlobovniczaSize(sRead.size),
 				blobovniczatree.WithBlobovniczaShallowDepth(sRead.depth),
 				blobovniczatree.WithBlobovniczaShallowWidth(sRead.width),
-				blobovniczatree.WithBlobovniczaLeafWidth(sRead.leafWidth),
 				blobovniczatree.WithOpenedCacheSize(sRead.openedCacheSize),
 				blobovniczatree.WithOpenedCacheTTL(sRead.openedCacheTTL),
 				blobovniczatree.WithOpenedCacheExpInterval(sRead.openedCacheExpInterval),
 				blobovniczatree.WithInitWorkerCount(sRead.initWorkerCount),
-				blobovniczatree.WithInitInAdvance(sRead.initInAdvance),
 				blobovniczatree.WithWaitBeforeDropDB(sRead.rebuildDropTimeout),
 				blobovniczatree.WithLogger(c.log),
 				blobovniczatree.WithObjectSizeLimit(shCfg.smallSizeObjectLimit),

cmd/frostfs-node/config/engine/config_test.go

@@ -100,9 +100,7 @@ func TestEngineSection(t *testing.T) {
 				require.EqualValues(t, 50, blz.OpenedCacheSize())
 				require.EqualValues(t, time.Minute, blz.OpenedCacheTTL())
 				require.EqualValues(t, 30*time.Second, blz.OpenedCacheExpInterval())
-				require.EqualValues(t, 10, blz.LeafWidth())
 				require.EqualValues(t, 10, blz.InitWorkerCount())
-				require.EqualValues(t, true, blz.InitInAdvance())
 				require.EqualValues(t, 30*time.Second, blz.RebuildDropTimeout())
 
 				require.Equal(t, "tmp/0/blob", ss[1].Path())
@@ -155,7 +153,6 @@ func TestEngineSection(t *testing.T) {
 				require.EqualValues(t, 50, blz.OpenedCacheSize())
 				require.EqualValues(t, 5*time.Minute, blz.OpenedCacheTTL())
 				require.EqualValues(t, 15*time.Second, blz.OpenedCacheExpInterval())
-				require.EqualValues(t, 10, blz.LeafWidth())
 				require.EqualValues(t, blobovniczaconfig.InitWorkerCountDefault, blz.InitWorkerCount())
 				require.EqualValues(t, blobovniczaconfig.RebuildDropTimeoutDefault, blz.RebuildDropTimeout())
 

cmd/frostfs-node/config/engine/shard/blobstor/blobovnicza/config.go

@@ -149,16 +149,6 @@ func (x *Config) BoltDB() *boltdbconfig.Config {
 	return (*boltdbconfig.Config)(x)
 }
 
-// LeafWidth returns the value of "leaf_width" config parameter.
-//
-// Returns 0 if the value is not a positive number.
-func (x *Config) LeafWidth() uint64 {
-	return config.UintSafe(
-		(*config.Config)(x),
-		"leaf_width",
-	)
-}
-
 // InitWorkerCount returns the value of "init_worker_count" config parameter.
 //
 // Returns InitWorkerCountDefault if the value is not a positive number.
@@ -175,16 +165,6 @@ func (x *Config) InitWorkerCount() int {
 	return InitWorkerCountDefault
 }
 
-// InitInAdvance returns the value of "init_in_advance" config parameter.
-//
-// Returns False if the value is not defined or invalid.
-func (x *Config) InitInAdvance() bool {
-	return config.BoolSafe(
-		(*config.Config)(x),
-		"init_in_advance",
-	)
-}
-
 // RebuildDropTimeout returns the value of "rebuild_drop_timeout" config parameter.
 //
 // Returns RebuildDropTimeoutDefault if the value is not defined or invalid.

config/example/node.env

@@ -126,9 +126,7 @@ FROSTFS_STORAGE_SHARD_0_BLOBSTOR_0_WIDTH=4
 FROSTFS_STORAGE_SHARD_0_BLOBSTOR_0_OPENED_CACHE_CAPACITY=50
 FROSTFS_STORAGE_SHARD_0_BLOBSTOR_0_OPENED_CACHE_TTL=1m
 FROSTFS_STORAGE_SHARD_0_BLOBSTOR_0_OPENED_CACHE_EXP_INTERVAL=30s
-FROSTFS_STORAGE_SHARD_0_BLOBSTOR_0_LEAF_WIDTH=10
 FROSTFS_STORAGE_SHARD_0_BLOBSTOR_0_INIT_WORKER_COUNT=10
-FROSTFS_STORAGE_SHARD_0_BLOBSTOR_0_INIT_IN_ADVANCE=TRUE
 FROSTFS_STORAGE_SHARD_0_BLOBSTOR_0_REBUILD_DROP_TIMEOUT=30s
 ### FSTree config
 FROSTFS_STORAGE_SHARD_0_BLOBSTOR_1_TYPE=fstree
@@ -178,7 +176,6 @@ FROSTFS_STORAGE_SHARD_1_BLOBSTOR_0_WIDTH=4
 FROSTFS_STORAGE_SHARD_1_BLOBSTOR_0_OPENED_CACHE_CAPACITY=50
 FROSTFS_STORAGE_SHARD_1_BLOBSTOR_0_OPENED_CACHE_TTL=5m
 FROSTFS_STORAGE_SHARD_1_BLOBSTOR_0_OPENED_CACHE_EXP_INTERVAL=15s
-FROSTFS_STORAGE_SHARD_1_BLOBSTOR_0_LEAF_WIDTH=10
 ### FSTree config
 FROSTFS_STORAGE_SHARD_1_BLOBSTOR_1_TYPE=fstree
 FROSTFS_STORAGE_SHARD_1_BLOBSTOR_1_PATH=tmp/1/blob

config/example/node.json

@@ -174,9 +174,7 @@
             "opened_cache_capacity": 50,
             "opened_cache_ttl": "1m",
             "opened_cache_exp_interval": "30s",
-            "leaf_width": 10,
             "init_worker_count": 10,
-            "init_in_advance": true,
             "rebuild_drop_timeout": "30s"
           },
           {
@@ -228,8 +226,7 @@
             "width": 4,
             "opened_cache_capacity": 50,
             "opened_cache_ttl": "5m",
-            "opened_cache_exp_interval": "15s",
+            "opened_cache_exp_interval": "15s"
-            "leaf_width": 10
           },
           {
             "type": "fstree",

config/example/node.yaml

@@ -149,7 +149,6 @@ storage:
           opened_cache_capacity: 50  # maximum number of opened database files
           opened_cache_ttl: 5m  # ttl for opened database file
           opened_cache_exp_interval: 15s  # cache cleanup interval for expired blobovnicza's
-          leaf_width: 10 # max count of key-value DB on leafs of object tree storage
         - perm: 0644  # permissions for blobstor files(directories: +x for current user and group)
           depth: 5  # max depth of object tree storage in FS
 
@@ -189,7 +188,6 @@ storage:
         - type: blobovnicza
           path: tmp/0/blob/blobovnicza
           init_worker_count: 10 #count of workers to initialize blobovniczas
-          init_in_advance: true
           rebuild_drop_timeout: 30s # timeout before drop single blobovnicza
           opened_cache_ttl: 1m
           opened_cache_exp_interval: 30s

docs/storage-node-configuration.md

@@ -242,7 +242,6 @@ blobstor:
 | `opened_cache_ttl`          | `duration` | `0`           | TTL in cache for opened blobovniczas(disabled by default). In case of heavy random-read and 10 shards each with 10_000 databases and accessing 400 objects per-second we will access each db approximately once per ((10 * 10_000 / 400) = 250 seconds <= 300 seconds = 5 min). Also take in mind that in this scenario they will probably be closed earlier because of the cache capacity, so bigger values are likely to be of no use. |
 | `opened_cache_exp_interval` | `duration` | `15s`         | Cache cleanup interval for expired blobovnicza's.                                                                                                                                                                                                                                                                                                                                                                                        |
 | `init_worker_count`         | `int`      | `5`           | Maximum number of concurrent initialization workers.                                                                                                                                                                                                                                                                                                                                                                                     |
-| `init_in_advance`           | `bool`     | `false`       | If `true`, than all the blobovnicza files will be created on startup.                                                                                                                                                                                                                                                                                                                                                                    |
 | `rebuild_drop_timeout`      | `duration` | `10s`         | Timeout before drop empty blobovnicza file during rebuild.                                                                                                                                                                                                                                                                                                                                                                               |
 
 ### `gc` subsection

internal/logs/logs.go

@@ -480,12 +480,6 @@ const (
 	BlobstoreRebuildStarted                                              = "blobstore rebuild started"
 	BlobstoreRebuildCompletedSuccessfully                                = "blobstore rebuild completed successfully"
 	BlobstoreRebuildStopped                                              = "blobstore rebuild stopped"
-	BlobovniczaTreeFixingFileExtensions                                  = "fixing blobovnicza tree file extensions..."
-	BlobovniczaTreeFixingFileExtensionsCompletedSuccessfully             = "fixing blobovnicza tree file extensions completed successfully"
-	BlobovniczaTreeFixingFileExtensionsFailed                            = "failed to fix blobovnicza tree file extensions"
-	BlobovniczaTreeFixingFileExtensionForFile                            = "fixing blobovnicza file extension..."
-	BlobovniczaTreeFixingFileExtensionCompletedSuccessfully              = "fixing blobovnicza file extension completed successfully"
-	BlobovniczaTreeFixingFileExtensionFailed                             = "failed to fix blobovnicza file extension"
 	BlobstorRebuildFailedToRebuildStorages                               = "failed to rebuild storages"
 	BlobstorRebuildRebuildStoragesCompleted                              = "storages rebuild completed"
 	BlobovniczaTreeCollectingDBToRebuild                                 = "collecting blobovniczas to rebuild..."

pkg/local_object_storage/blobstor/blobovniczatree/active.go

@@ -37,17 +37,17 @@ type activeDBManager struct {
 	closed               bool
 
 	dbManager *dbManager
-	leafWidth uint64
+	rootPath  string
 }
 
-func newActiveDBManager(dbManager *dbManager, leafWidth uint64) *activeDBManager {
+func newActiveDBManager(dbManager *dbManager, rootPath string) *activeDBManager {
 	return &activeDBManager{
 		levelToActiveDBGuard: &sync.RWMutex{},
 		levelToActiveDB:      make(map[string]*sharedDB),
 		levelLock:            utilSync.NewKeyLocker[string](),
 
 		dbManager: dbManager,
-		leafWidth: leafWidth,
+		rootPath:  rootPath,
 	}
 }
 
@@ -144,30 +144,25 @@ func (m *activeDBManager) updateAndGetActive(lvlPath string) (*activeDB, error)
 }
 
 func (m *activeDBManager) getNextSharedDB(lvlPath string) (*sharedDB, error) {
-	var idx uint64
+	var nextActiveDBIdx uint64
-	var iterCount uint64
 	hasActive, currentIdx := m.hasActiveDB(lvlPath)
 	if hasActive {
-		idx = (currentIdx + 1) % m.leafWidth
+		nextActiveDBIdx = currentIdx + 1
-	}
+	} else {
-
+		hasDBs, maxIdx, err := getBlobovniczaMaxIndex(filepath.Join(m.rootPath, lvlPath))
-	var next *sharedDB
-
-	for iterCount < m.leafWidth {
-		path := filepath.Join(lvlPath, u64ToHexStringExt(idx))
-		shDB := m.dbManager.GetByPath(path)
-		db, err := shDB.Open() // open db to hold active DB open, will be closed if db is full, after m.replace or by activeDBManager.Close()
 		if err != nil {
 			return nil, err
 		}
-		if db.IsFull() {
+		if hasDBs {
-			shDB.Close()
+			nextActiveDBIdx = maxIdx
-		} else {
-			next = shDB
-			break
 		}
-		idx = (idx + 1) % m.leafWidth
+	}
-		iterCount++
+
+	path := filepath.Join(lvlPath, u64ToHexStringExt(nextActiveDBIdx))
+	next := m.dbManager.GetByPath(path)
+	_, err := next.Open() // open db to hold active DB open, will be closed if db is full, after m.replace or by activeDBManager.Close()
+	if err != nil {
+		return nil, err
 	}
 
 	previous, updated := m.replace(lvlPath, next)

pkg/local_object_storage/blobstor/blobovniczatree/blobovnicza.go

@@ -3,6 +3,7 @@ package blobovniczatree
 import (
 	"context"
 	"errors"
+	"os"
 	"strconv"
 	"strings"
 	"sync"
@@ -81,12 +82,8 @@ func NewBlobovniczaTree(ctx context.Context, opts ...Option) (blz *Blobovniczas)
 		opts[i](&blz.cfg)
 	}
 
-	if blz.blzLeafWidth == 0 {
-		blz.blzLeafWidth = blz.blzShallowWidth
-	}
-
 	blz.commondbManager = newDBManager(blz.rootPath, blz.blzOpts, blz.readOnly, blz.metrics.Blobovnicza(), blz.log)
-	blz.activeDBManager = newActiveDBManager(blz.commondbManager, blz.blzLeafWidth)
+	blz.activeDBManager = newActiveDBManager(blz.commondbManager, blz.rootPath)
 	blz.dbCache = newDBCache(ctx, blz.openedCacheSize,
 		blz.openedCacheTTL, blz.openedCacheExpInterval, blz.commondbManager)
 	blz.deleteProtectedObjects = newAddressMap()
@@ -124,6 +121,29 @@ func u64FromHexString(str string) uint64 {
 	return v
 }
 
+func getBlobovniczaMaxIndex(directory string) (bool, uint64, error) {
+	entries, err := os.ReadDir(directory)
+	if os.IsNotExist(err) { // non initialized tree
+		return false, 0, nil
+	}
+	if err != nil {
+		return false, 0, err
+	}
+	if len(entries) == 0 {
+		return false, 0, nil
+	}
+	var hasDBs bool
+	var maxIdx uint64
+	for _, e := range entries {
+		if e.IsDir() {
+			continue
+		}
+		hasDBs = true
+		maxIdx = max(u64FromHexString(e.Name()), maxIdx)
+	}
+	return hasDBs, maxIdx, nil
+}
+
 // Type is blobovniczatree storage type used in logs and configuration.
 const Type = "blobovnicza"
 

pkg/local_object_storage/blobstor/blobovniczatree/control.go

@@ -2,10 +2,6 @@ package blobovniczatree
 
 import (
 	"context"
-	"errors"
-	"os"
-	"path/filepath"
-	"strings"
 
 	"git.frostfs.info/TrueCloudLab/frostfs-node/internal/logs"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode"
@@ -14,8 +10,6 @@ import (
 	"golang.org/x/sync/errgroup"
 )
 
-var errFailedToChangeExtensionReadOnly = errors.New("failed to change blobovnicza extension: read only mode")
-
 // Open opens blobovnicza tree.
 func (b *Blobovniczas) Open(mode mode.ComponentMode) error {
 	b.readOnly = mode.ReadOnly()
@@ -31,13 +25,6 @@ func (b *Blobovniczas) Open(mode mode.ComponentMode) error {
 func (b *Blobovniczas) Init() error {
 	b.log.Debug(logs.BlobovniczatreeInitializingBlobovniczas)
 
-	b.log.Debug(logs.BlobovniczaTreeFixingFileExtensions)
-	if err := b.addDBExtensionToDBs(b.rootPath, 0); err != nil {
-		b.log.Error(logs.BlobovniczaTreeFixingFileExtensionsFailed, zap.Error(err))
-		return err
-	}
-	b.log.Debug(logs.BlobovniczaTreeFixingFileExtensionsCompletedSuccessfully)
-
 	if b.readOnly {
 		b.log.Debug(logs.BlobovniczatreeReadonlyModeSkipBlobovniczasInitialization)
 		return nil
@@ -83,31 +70,6 @@ func (b *Blobovniczas) initializeDBs(ctx context.Context) error {
 		return err
 	}
 
-	if b.createDBInAdvance {
-		err = b.iterateSortedLeaves(egCtx, nil, func(p string) (bool, error) {
-			if _, found := visited[p]; found {
-				return false, nil
-			}
-			eg.Go(func() error {
-				shBlz := b.getBlobovniczaWithoutCaching(p)
-				_, err := shBlz.Open()
-				if err != nil {
-					return err
-				}
-				defer shBlz.Close()
-
-				b.log.Debug(logs.BlobovniczatreeBlobovniczaSuccessfullyInitializedClosing, zap.String("id", p))
-				return nil
-			})
-			return false, nil
-		})
-
-		if err != nil {
-			_ = eg.Wait()
-			return err
-		}
-	}
-
 	return eg.Wait()
 }
 
@@ -136,37 +98,3 @@ func (b *Blobovniczas) getBlobovnicza(p string) *sharedDB {
 func (b *Blobovniczas) getBlobovniczaWithoutCaching(p string) *sharedDB {
 	return b.commondbManager.GetByPath(p)
 }
-
-func (b *Blobovniczas) addDBExtensionToDBs(path string, depth uint64) error {
-	entries, err := os.ReadDir(path)
-	if os.IsNotExist(err) && depth == 0 {
-		return nil
-	}
-
-	for _, entry := range entries {
-		if entry.IsDir() {
-			if err := b.addDBExtensionToDBs(filepath.Join(path, entry.Name()), depth+1); err != nil {
-				return err
-			}
-			continue
-		}
-
-		if strings.HasSuffix(entry.Name(), dbExtension) {
-			continue
-		}
-		if b.readOnly {
-			return errFailedToChangeExtensionReadOnly
-		}
-
-		sourcePath := filepath.Join(path, entry.Name())
-		targetPath := filepath.Join(path, entry.Name()+dbExtension)
-		b.log.Debug(logs.BlobovniczaTreeFixingFileExtensionForFile, zap.String("source", sourcePath), zap.String("target", targetPath))
-		if err := os.Rename(sourcePath, targetPath); err != nil {
-			b.log.Error(logs.BlobovniczaTreeFixingFileExtensionFailed, zap.String("source", sourcePath), zap.String("target", targetPath), zap.Error(err))
-			return err
-		}
-		b.log.Debug(logs.BlobovniczaTreeFixingFileExtensionCompletedSuccessfully, zap.String("source", sourcePath), zap.String("target", targetPath))
-	}
-
-	return nil
-}

pkg/local_object_storage/blobstor/blobovniczatree/control_test.go

@@ -2,78 +2,15 @@ package blobovniczatree
 
 import (
 	"context"
-	"os"
-	"path/filepath"
-	"strings"
 	"testing"
 
 	objectCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object"
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/internal/blobstortest"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode"
 	"github.com/stretchr/testify/require"
 )
 
-func TestDBExtensionFix(t *testing.T) {
-	root := t.TempDir()
-	createTestTree(t, 0, 2, 3, root)
-	t.Run("adds suffix if not exists", func(t *testing.T) {
-		openAndCloseTestTree(t, 2, 3, root)
-		validateTestTree(t, root)
-	})
-
-	t.Run("not adds second suffix if exists", func(t *testing.T) {
-		openAndCloseTestTree(t, 2, 3, root)
-		validateTestTree(t, root)
-	})
-}
-
-func createTestTree(t *testing.T, currentDepth, depth, width uint64, path string) {
-	if currentDepth == depth {
-		var w uint64
-		for ; w < width; w++ {
-			dbPath := filepath.Join(path, u64ToHexString(w))
-			b := blobovnicza.New(blobovnicza.WithPath(dbPath))
-			require.NoError(t, b.Open())
-			require.NoError(t, b.Init())
-			require.NoError(t, b.Close())
-		}
-		return
-	}
-
-	var w uint64
-	for ; w < width; w++ {
-		createTestTree(t, currentDepth+1, depth, width, filepath.Join(path, u64ToHexString(w)))
-	}
-}
-
-func openAndCloseTestTree(t *testing.T, depth, width uint64, path string) {
-	blz := NewBlobovniczaTree(
-		context.Background(),
-		WithBlobovniczaShallowDepth(depth),
-		WithBlobovniczaShallowWidth(width),
-		WithRootPath(path),
-	)
-	require.NoError(t, blz.Open(mode.ComponentReadWrite))
-	require.NoError(t, blz.Init())
-	require.NoError(t, blz.Close())
-}
-
-func validateTestTree(t *testing.T, path string) {
-	entries, err := os.ReadDir(path)
-	require.NoError(t, err)
-
-	for _, entry := range entries {
-		if entry.IsDir() {
-			validateTestTree(t, filepath.Join(path, entry.Name()))
-		} else {
-			require.True(t, strings.HasSuffix(entry.Name(), dbExtension))
-			require.False(t, strings.HasSuffix(strings.TrimSuffix(entry.Name(), dbExtension), dbExtension))
-		}
-	}
-}
-
 func TestObjectsAvailableAfterDepthAndWidthEdit(t *testing.T) {
 	t.Parallel()
 

pkg/local_object_storage/blobstor/blobovniczatree/iterate.go

@@ -130,7 +130,14 @@ func (b *Blobovniczas) iterateSorted(ctx context.Context, addr *oid.Address, cur
 	isLeafLevel := uint64(len(curPath)) == b.blzShallowDepth
 	levelWidth := b.blzShallowWidth
 	if isLeafLevel {
-		levelWidth = b.blzLeafWidth
+		hasDBs, maxIdx, err := getBlobovniczaMaxIndex(filepath.Join(append([]string{b.rootPath}, curPath...)...))
+		if err != nil {
+			return false, err
+		}
+		levelWidth = 0
+		if hasDBs {
+			levelWidth = maxIdx + 1
+		}
 	}
 	indices := indexSlice(levelWidth)
 

pkg/local_object_storage/blobstor/blobovniczatree/iterate_test.go

@@ -1,44 +0,0 @@
-package blobovniczatree
-
-import (
-	"context"
-	"testing"
-
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode"
-	oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test"
-	"github.com/stretchr/testify/require"
-)
-
-func TestIterateSortedLeavesAndDBPathsAreSame(t *testing.T) {
-	t.Parallel()
-
-	blz := NewBlobovniczaTree(
-		context.Background(),
-		WithBlobovniczaShallowDepth(3),
-		WithBlobovniczaShallowWidth(5),
-		WithRootPath(t.TempDir()),
-	)
-	blz.createDBInAdvance = true
-	require.NoError(t, blz.Open(mode.ComponentReadWrite))
-	require.NoError(t, blz.Init())
-	defer func() {
-		require.NoError(t, blz.Close())
-	}()
-
-	addr := oidtest.Address()
-
-	var leaves []string
-	var dbPaths []string
-
-	blz.iterateSortedLeaves(context.Background(), &addr, func(s string) (bool, error) {
-		leaves = append(leaves, s)
-		return false, nil
-	})
-
-	blz.iterateSortedDBPaths(context.Background(), addr, func(s string) (bool, error) {
-		dbPaths = append(dbPaths, s)
-		return false, nil
-	})
-
-	require.Equal(t, leaves, dbPaths)
-}

pkg/local_object_storage/blobstor/blobovniczatree/option.go

@@ -18,7 +18,6 @@ type cfg struct {
 	openedCacheSize    int
 	blzShallowDepth    uint64
 	blzShallowWidth    uint64
-	blzLeafWidth       uint64
 	compression        *compression.Config
 	blzOpts            []blobovnicza.Option
 	reportError        func(string, error) // reportError is the function called when encountering disk errors.
@@ -26,7 +25,6 @@ type cfg struct {
 	waitBeforeDropDB   time.Duration
 	blzInitWorkerCount int
 	blzMoveBatchSize   int
-	createDBInAdvance  bool
 	// TTL for blobovnicza's cache
 	openedCacheTTL time.Duration
 	// Interval for deletion expired blobovnicza's
@@ -83,12 +81,6 @@ func WithBlobovniczaShallowWidth(width uint64) Option {
 	}
 }
 
-func WithBlobovniczaLeafWidth(w uint64) Option {
-	return func(c *cfg) {
-		c.blzLeafWidth = w
-	}
-}
-
 func WithBlobovniczaShallowDepth(depth uint64) Option {
 	return func(c *cfg) {
 		c.blzShallowDepth = depth
@@ -160,10 +152,3 @@ func WithInitWorkerCount(v int) Option {
 		c.blzInitWorkerCount = v
 	}
 }
-
-// WithInitInAdvance returns an option to create blobovnicza tree DB's in advance.
-func WithInitInAdvance(v bool) Option {
-	return func(c *cfg) {
-		c.createDBInAdvance = v
-	}
-}