From d30454a572eee873162a6212a1b321f9b640119a Mon Sep 17 00:00:00 2001 From: Leonard Lyubich Date: Mon, 30 Nov 2020 17:30:32 +0300 Subject: [PATCH] [#220] shard: Use new metabase implementation Signed-off-by: Leonard Lyubich --- pkg/local_object_storage/shard/put.go | 2 +- pkg/local_object_storage/shard/shard.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/local_object_storage/shard/put.go b/pkg/local_object_storage/shard/put.go index 8c941eeb..77081521 100644 --- a/pkg/local_object_storage/shard/put.go +++ b/pkg/local_object_storage/shard/put.go @@ -49,7 +49,7 @@ func (s *Shard) Put(prm *PutPrm) (*PutRes, error) { } // put to metabase - if err := s.metaBase.Put(prm.obj); err != nil { + if err := s.metaBase.Put(prm.obj, nil); err != nil { // may we need to handle this case in a special way // since the object has been successfully written to BlobStor return nil, errors.Wrap(err, "could not put object to metabase") diff --git a/pkg/local_object_storage/shard/shard.go b/pkg/local_object_storage/shard/shard.go index 3e148c2e..a8938f36 100644 --- a/pkg/local_object_storage/shard/shard.go +++ b/pkg/local_object_storage/shard/shard.go @@ -2,7 +2,7 @@ package shard import ( "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor" - 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/util/logger" "go.uber.org/atomic" ) @@ -47,7 +47,7 @@ func New(opts ...Option) *Shard { cfg: c, mode: atomic.NewUint32(0), // TODO: init with particular mode blobStor: blobstor.New(c.blobOpts...), - metaBase: meta.NewDB(c.metaOpts...), + metaBase: meta.New(c.metaOpts...), } }