TrueCloudLab
/
frostfs-node
18
1
Fork 20
Code Issues 88 Pull Requests 7 Actions Releases Activity

writecache: Fix panic on Get when it is not initialized #987

Merged
fyrchik merged 2 commits from acid-ant/frostfs-node:bugfix/959-rebuild-blobstor into master 2024-02-14 16:01:16 +00:00
Conversation 0 Commits 2 Files Changed 2
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/local_object_storage/shard/control.go
View File

@ -173,8 +173,9 @@ func (s *Shard) Init(ctx context.Context) error {
s.gc.init(ctx) s.gc.init(ctx)
s.rb = newRebuilder(s.rebuildLimiter) s.rb = newRebuilder(s.rebuildLimiter)
s.rb.Start(ctx, s.blobStor, s.metaBase, s.log) if !m.NoMetabase() {
s.rb.Start(ctx, s.blobStor, s.metaBase, s.log)
}
return nil return nil
} }
@ -327,9 +328,11 @@ func (s *Shard) Reload(ctx context.Context, opts ...Option) error {
defer unlock() defer unlock()
s.rb.Stop(s.log) s.rb.Stop(s.log)
defer func() { if !s.info.Mode.NoMetabase() {
s.rb.Start(ctx, s.blobStor, s.metaBase, s.log) defer func() {
}() s.rb.Start(ctx, s.blobStor, s.metaBase, s.log)
}()
}
ok, err := s.metaBase.Reload(c.metaOpts...) ok, err := s.metaBase.Reload(c.metaOpts...)
if err != nil { if err != nil {

3
pkg/local_object_storage/writecache/get.go
View File

@ -84,6 +84,9 @@ func (c *cache) Head(ctx context.Context, addr oid.Address) (*objectSDK.Object,
// //
// Returns an error of type apistatus.ObjectNotFound if the requested object is missing in db. // Returns an error of type apistatus.ObjectNotFound if the requested object is missing in db.
func Get(db *bbolt.DB, key []byte) ([]byte, error) { func Get(db *bbolt.DB, key []byte) ([]byte, error) {
if db == nil {
return nil, ErrNotInitialized
}
var value []byte var value []byte
err := db.View(func(tx *bbolt.Tx) error { err := db.View(func(tx *bbolt.Tx) error {
b := tx.Bucket(defaultBucket) b := tx.Bucket(defaultBucket)