aarifullin/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#547] metabase: Fix datarace in tests

Browse source 
Quite an old one bf9e938a3b.

Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
This commit is contained in:
Evgenii Stratonikov 2023-07-26 16:02:08 +03:00 committed by Evgenii Stratonikov
parent 05ac9e3637
commit 35dc64bd7b
3 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkg/local_object_storage/metabase/put.go
View file

@ -111,6 +111,7 @@ func (db *DB) put(tx *bbolt.Tx,
exists, err := db.exists(tx, objectCore.AddressOf(obj), currEpoch) exists, err := db.exists(tx, objectCore.AddressOf(obj), currEpoch)
var splitInfoError *objectSDK.SplitInfoError
if errors.As(err, &splitInfoError) { if errors.As(err, &splitInfoError) {
exists = true // object exists, however it is virtual exists = true // object exists, however it is virtual
} else if err != nil { } else if err != nil {

1
pkg/local_object_storage/metabase/select.go
View file

@ -427,6 +427,7 @@ func (db *DB) selectObjectID(
addr.SetContainer(cnr) addr.SetContainer(cnr)
addr.SetObject(id) addr.SetObject(id)
var splitInfoError *objectSDK.SplitInfoError
ok, err := db.exists(tx, addr, currEpoch) ok, err := db.exists(tx, addr, currEpoch)
if (err == nil && ok) || errors.As(err, &splitInfoError) { if (err == nil && ok) || errors.As(err, &splitInfoError) {
raw := make([]byte, objectKeySize) raw := make([]byte, objectKeySize)

2
pkg/local_object_storage/metabase/util.go
View file

@ -120,8 +120,6 @@ const (
addressKeySize = cidSize + objectKeySize addressKeySize = cidSize + objectKeySize
) )
var splitInfoError *objectSDK.SplitInfoError // for errors.As comparisons
func bucketName(cnr cid.ID, prefix byte, key []byte) []byte { func bucketName(cnr cid.ID, prefix byte, key []byte) []byte {
key[0] = prefix key[0] = prefix
cnr.Encode(key[1:]) cnr.Encode(key[1:])