realloc/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Releases Packages Activity

[#1559] local_object_storage: Provide readOnly flag to Open

Browse source 
We should be able to reopen storage in readonly in runtime.

Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2022-06-28 16:42:50 +03:00 • committed by fyrchik
parent e38b0aa4ba
commit 1e786233bf
20 changed files with 70 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pkg/local_object_storage/blobstor/blobovnicza.go
View file

@ -910,6 +910,7 @@ func (b *blobovniczas) openBlobovnicza(p string) (*blobovnicza.Blobovnicza, erro
}
blz := blobovnicza.New(append(b.blzOpts,
blobovnicza.WithReadOnly(b.readOnly),
blobovnicza.WithPath(filepath.Join(b.blzRootPath, p)),
)...)

2
pkg/local_object_storage/blobstor/blobstor.go
View file

@ -44,6 +44,8 @@ type cfg struct {
blzRootPath string
readOnly bool
blzOpts []blobovnicza.Option
}

4
pkg/local_object_storage/blobstor/blobstor_test.go
View file

@ -24,7 +24,7 @@ func TestCompression(t *testing.T) {
WithRootPath(dir),
WithSmallSizeLimit(smallSizeLimit),
WithBlobovniczaShallowWidth(1)) // default width is 16, slow init
require.NoError(t, bs.Open())
require.NoError(t, bs.Open(false))
require.NoError(t, bs.Init())
return bs
}
@ -90,7 +90,7 @@ func TestBlobstor_needsCompression(t *testing.T) {
WithSmallSizeLimit(smallSizeLimit),
WithBlobovniczaShallowWidth(1),
WithUncompressableContentTypes(ct))
require.NoError(t, bs.Open())
require.NoError(t, bs.Open(false))
require.NoError(t, bs.Init())
return bs
}

4
pkg/local_object_storage/blobstor/control.go
View file

@ -6,9 +6,11 @@ import (
)
// Open opens BlobStor.
func (b *BlobStor) Open() error {
func (b *BlobStor) Open(readOnly bool) error {
b.log.Debug("opening...")
b.blobovniczas.readOnly = readOnly
return nil
}

2
pkg/local_object_storage/blobstor/exists_test.go
View file

@ -21,7 +21,7 @@ func TestExists(t *testing.T) {
b := New(WithRootPath(dir),
WithSmallSizeLimit(smallSizeLimit),
WithBlobovniczaShallowWidth(1)) // default width is 16, slow init
require.NoError(t, b.Open())
require.NoError(t, b.Open(false))
require.NoError(t, b.Init())
objects := []*objectSDK.Object{

8
pkg/local_object_storage/blobstor/iterate_test.go
View file

@ -34,7 +34,7 @@ func TestIterateObjects(t *testing.T) {
defer os.RemoveAll(p)
// open Blobstor
require.NoError(t, blobStor.Open())
require.NoError(t, blobStor.Open(false))
// initialize Blobstor
require.NoError(t, blobStor.Init())
@ -111,7 +111,7 @@ func TestIterate_IgnoreErrors(t *testing.T) {
WithBlobovniczaShallowWidth(1),
WithBlobovniczaShallowDepth(1)}
bs := New(bsOpts...)
require.NoError(t, bs.Open())
require.NoError(t, bs.Open(false))
require.NoError(t, bs.Init())
addrs := make([]oid.Address, objCount)
@ -148,7 +148,7 @@ func TestIterate_IgnoreErrors(t *testing.T) {
// Increase width to have blobovnicza which is definitely empty.
b := New(append(bsOpts, WithBlobovniczaShallowWidth(2))...)
require.NoError(t, b.Open())
require.NoError(t, b.Open(false))
require.NoError(t, b.Init())
var p string
@ -163,7 +163,7 @@ func TestIterate_IgnoreErrors(t *testing.T) {
require.NoError(t, os.Chmod(p, 0))
require.NoError(t, b.Close())
require.NoError(t, bs.Open())
require.NoError(t, bs.Open(false))
require.NoError(t, bs.Init())
var prm IteratePrm