CHANGELOG.md

@@ -27,7 +27,6 @@ Changelog for FrostFS Node
 - `neo-go` to `v0.101.1`
 - `google.golang.org/grpc` to `v1.55.0`
 - `paulmach/orb` to `v0.9.2`
-- `go.etcd.io/bbolt` to `v1.3.7`
 - `github.com/nats-io/nats.go` to `v1.25.0`
 - `golang.org/x/sync` to `v0.2.0`
 - `golang.org/x/term` to `v0.8.0`

go.mod

@@ -29,7 +29,7 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.16.0
 	github.com/stretchr/testify v1.8.4
-	go.etcd.io/bbolt v1.3.7
+	go.etcd.io/bbolt v1.3.6
 	go.opentelemetry.io/otel v1.16.0
 	go.opentelemetry.io/otel/trace v1.16.0
 	go.uber.org/zap v1.24.0

go.sum

@@ -557,9 +557,8 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t
 github.com/yuin/gopher-lua v0.0.0-20190514113301-1cd887cd7036/go.mod h1:gqRgreBUhTSL0GeU64rtZ3Uq3wtjOa/TB2YfrtkCbVQ=
 github.com/yuin/gopher-lua v0.0.0-20191128022950-c6266f4fe8d7/go.mod h1:gqRgreBUhTSL0GeU64rtZ3Uq3wtjOa/TB2YfrtkCbVQ=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
+go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=
 go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
-go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ=
-go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
 go.mongodb.org/mongo-driver v1.11.4/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g=
 go.mongodb.org/mongo-driver v1.12.0 h1:aPx33jmn/rQuJXPQLZQ8NtfPQG8CaqgLThFtqRb0PiE=
 go.mongodb.org/mongo-driver v1.12.0/go.mod h1:AZkxhPnFJUoH7kZlFkVKucV20K387miPfm7oimrSmK0=

pkg/local_object_storage/metabase/iterators.go

@@ -94,8 +94,12 @@ func (db *DB) iterateExpired(tx *bbolt.Tx, epoch uint64, h ExpiredObjectHandler)
 			return fmt.Errorf("could not parse container ID of expired bucket: %w", err)
 		}
 
-		return b.ForEachBucket(func(expKey []byte) error {
+		return b.ForEach(func(expKey, _ []byte) error {
 			bktExpired := b.Bucket(expKey)
+			if bktExpired == nil {
+				return nil
+			}
+
 			expiresAfter, err := strconv.ParseUint(string(expKey), 10, 64)
 			if err != nil {
 				return fmt.Errorf("could not parse expiration epoch: %w", err)

pkg/local_object_storage/metabase/select.go

@@ -326,8 +326,12 @@ func selectOutsideFKBT(
 
 	bktExcl := tx.Bucket(name)
 	if bktExcl != nil {
-		_ = bktExcl.ForEachBucket(func(k []byte) error {
+		_ = bktExcl.ForEach(func(k, _ []byte) error {
 			exclBktLeaf := bktExcl.Bucket(k)
+			if exclBktLeaf == nil {
+				return nil
+			}
+
 			return exclBktLeaf.ForEach(func(k, _ []byte) error {
 				mExcl[string(k)] = struct{}{}